From 27d3059416eb084c42f794bc43d83e69b3da3524 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 31 Mar 2020 21:52:22 +0300
Subject: [PATCH 001/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B0=D1=85=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/MethodSymbolComputer.java        | 49 ++++++++++++++++---
 .../context/symbol/MethodSymbol.java          |  3 ++
 .../context/symbol/ParameterDefinition.java   | 37 ++++++++++++++
 .../context/DocumentContextTest.java          | 33 ++++++++++++-
 .../resources/context/DocumentContextTest.bsl |  4 ++
 5 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/ParameterDefinition.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index b9089d3b377..60bb704c81b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.ParameterDefinition;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
@@ -34,8 +35,10 @@
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public final class MethodSymbolComputer
   extends BSLParserBaseVisitor<ParseTree>
@@ -70,14 +73,30 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
       return ctx;
     }
 
-    MethodSymbol methodSymbol = MethodSymbol.builder()
+    MethodSymbol.MethodSymbolBuilder builder = MethodSymbol.builder()
       .name(declaration.subName().getText())
       .range(Ranges.create(startNode, stopNode))
       .subNameRange(Ranges.create(declaration.subName()))
       .function(true)
       .export(declaration.EXPORT_KEYWORD() != null)
-      .description(createDescription(startNode.getSymbol()))
-      .build();
+      .description(createDescription(startNode.getSymbol()));
+
+    List<ParameterDefinition> parameters = Optional.ofNullable(declaration.paramList())
+      .map(paramList -> paramList.param().stream()
+        .filter(param -> param.IDENTIFIER() != null)
+        .map(param ->
+          ParameterDefinition.builder()
+            .name(param.IDENTIFIER().getText())
+            .byValue(param.VAL_KEYWORD() != null)
+            .optional(param.defaultValue() != null)
+            .build()
+        ).collect(Collectors.toList())
+      )
+      .orElseGet(Collections::emptyList);
+
+    builder.parameters(parameters);
+
+    MethodSymbol methodSymbol = builder.build();
 
     methods.add(methodSymbol);
 
@@ -99,14 +118,32 @@ public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
       return ctx;
     }
 
-    MethodSymbol methodSymbol = MethodSymbol.builder()
+    MethodSymbol.MethodSymbolBuilder builder = MethodSymbol.builder()
       .name(declaration.subName().getText())
       .range(Ranges.create(startNode, stopNode))
       .subNameRange(Ranges.create(declaration.subName()))
       .function(false)
       .export(declaration.EXPORT_KEYWORD() != null)
-      .description(createDescription(startNode.getSymbol()))
-      .build();
+      .description(createDescription(startNode.getSymbol()));
+
+    List<ParameterDefinition> parameters = Optional.ofNullable(declaration.paramList())
+      .map(paramList -> paramList.param().stream()
+        .filter(param -> param.IDENTIFIER() != null)
+        .map(param ->
+          ParameterDefinition.builder()
+            .name(param
+              .IDENTIFIER()
+              .getText())
+            .byValue(param.VAL_KEYWORD() != null)
+            .optional(param.defaultValue() != null)
+            .build()
+        ).collect(Collectors.toList())
+      )
+      .orElseGet(Collections::emptyList);
+
+    builder.parameters(parameters);
+
+    MethodSymbol methodSymbol = builder.build();
 
     methods.add(methodSymbol);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
index 676ca369fb7..337583fadaa 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
@@ -57,6 +57,9 @@ public class MethodSymbol implements Symbol {
   boolean export;
   Optional<MethodDescription> description;
 
+  @Builder.Default
+  List<ParameterDefinition> parameters = new ArrayList<>();
+
   public Optional<RegionSymbol> getRegion() {
     return getParent()
       .filter(symbol -> symbol instanceof RegionSymbol)
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/ParameterDefinition.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/ParameterDefinition.java
new file mode 100644
index 00000000000..7da5671b7b5
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/ParameterDefinition.java
@@ -0,0 +1,37 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.context.symbol;
+
+import lombok.Builder;
+import lombok.Value;
+
+/**
+ * Класс хранит информацию о параметре метода.
+ * См. {@link MethodSymbol}
+ */
+@Value
+@Builder
+public class ParameterDefinition {
+  String name;
+  boolean byValue;
+  boolean optional;
+}
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
index 7f8e516573c..bae3d5373f8 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
@@ -69,7 +69,38 @@ void testMethodCompute() {
 
     DocumentContext documentContext = getDocumentContext();
 
-    assertThat(documentContext.getSymbolTree().getMethods().size()).isEqualTo(2);
+    assertThat(documentContext.getSymbolTree().getMethods().size()).isEqualTo(3);
+
+  }
+
+  @Test
+  void testMethodParametersComputesCorrectly() {
+    DocumentContext documentContext = getDocumentContext();
+    assertThat(documentContext.getSymbolTree().getMethods())
+      .filteredOn(methodSymbol -> methodSymbol.getName().equals("ФункцияСПараметрами"))
+      .flatExtracting(MethodSymbol::getParameters)
+      .hasSize(4)
+      .anyMatch(parameterDefinition ->
+        parameterDefinition.getName().equals("Парам1")
+        && !parameterDefinition.isByValue()
+        && !parameterDefinition.isOptional()
+      )
+      .anyMatch(parameterDefinition ->
+        parameterDefinition.getName().equals("Парам2")
+          && parameterDefinition.isByValue()
+          && !parameterDefinition.isOptional()
+      )
+      .anyMatch(parameterDefinition ->
+        parameterDefinition.getName().equals("Парам3")
+          && !parameterDefinition.isByValue()
+          && parameterDefinition.isOptional()
+      )
+      .anyMatch(parameterDefinition ->
+        parameterDefinition.getName().equals("Парам4")
+          && parameterDefinition.isByValue()
+          && parameterDefinition.isOptional()
+      )
+    ;
 
   }
 
diff --git a/src/test/resources/context/DocumentContextTest.bsl b/src/test/resources/context/DocumentContextTest.bsl
index 1bfe22fbe76..f6c9e8f83e5 100644
--- a/src/test/resources/context/DocumentContextTest.bsl
+++ b/src/test/resources/context/DocumentContextTest.bsl
@@ -30,3 +30,7 @@
 #КонецОбласти
 
 #КонецОбласти
+
+Функция ФункцияСПараметрами(Парам1, Знач Парам2, Парам3 = 0, Знач Парам4 = 0)
+
+КонецФункции

From f1f311ab2154622703aa0baad00a67c6b5d55fbd Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 1 Apr 2020 13:04:19 +0300
Subject: [PATCH 002/444] Fix QF

---
 .../computer/MethodSymbolComputer.java        | 106 +++++++++---------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index 60bb704c81b..73f5ccab7a1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -34,6 +34,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -73,30 +74,14 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
       return ctx;
     }
 
-    MethodSymbol.MethodSymbolBuilder builder = MethodSymbol.builder()
-      .name(declaration.subName().getText())
-      .range(Ranges.create(startNode, stopNode))
-      .subNameRange(Ranges.create(declaration.subName()))
-      .function(true)
-      .export(declaration.EXPORT_KEYWORD() != null)
-      .description(createDescription(startNode.getSymbol()));
-
-    List<ParameterDefinition> parameters = Optional.ofNullable(declaration.paramList())
-      .map(paramList -> paramList.param().stream()
-        .filter(param -> param.IDENTIFIER() != null)
-        .map(param ->
-          ParameterDefinition.builder()
-            .name(param.IDENTIFIER().getText())
-            .byValue(param.VAL_KEYWORD() != null)
-            .optional(param.defaultValue() != null)
-            .build()
-        ).collect(Collectors.toList())
-      )
-      .orElseGet(Collections::emptyList);
-
-    builder.parameters(parameters);
-
-    MethodSymbol methodSymbol = builder.build();
+    MethodSymbol methodSymbol = createMethodSymbol(
+      startNode,
+      stopNode,
+      declaration.subName(),
+      declaration.paramList(),
+      true,
+      declaration.EXPORT_KEYWORD() != null
+    );
 
     methods.add(methodSymbol);
 
@@ -118,38 +103,39 @@ public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
       return ctx;
     }
 
-    MethodSymbol.MethodSymbolBuilder builder = MethodSymbol.builder()
-      .name(declaration.subName().getText())
-      .range(Ranges.create(startNode, stopNode))
-      .subNameRange(Ranges.create(declaration.subName()))
-      .function(false)
-      .export(declaration.EXPORT_KEYWORD() != null)
-      .description(createDescription(startNode.getSymbol()));
-
-    List<ParameterDefinition> parameters = Optional.ofNullable(declaration.paramList())
-      .map(paramList -> paramList.param().stream()
-        .filter(param -> param.IDENTIFIER() != null)
-        .map(param ->
-          ParameterDefinition.builder()
-            .name(param
-              .IDENTIFIER()
-              .getText())
-            .byValue(param.VAL_KEYWORD() != null)
-            .optional(param.defaultValue() != null)
-            .build()
-        ).collect(Collectors.toList())
-      )
-      .orElseGet(Collections::emptyList);
-
-    builder.parameters(parameters);
-
-    MethodSymbol methodSymbol = builder.build();
+    MethodSymbol methodSymbol = createMethodSymbol(
+      startNode,
+      stopNode,
+      declaration.subName(),
+      declaration.paramList(),
+      false,
+      declaration.EXPORT_KEYWORD() != null
+    );
 
     methods.add(methodSymbol);
 
     return ctx;
   }
 
+  private MethodSymbol createMethodSymbol(
+    TerminalNode startNode,
+    TerminalNode stopNode,
+    BSLParser.SubNameContext subName,
+    BSLParser.ParamListContext paramList,
+    boolean function,
+    boolean export
+  ) {
+    return MethodSymbol.builder()
+      .name(subName.getText())
+      .range(Ranges.create(startNode, stopNode))
+      .subNameRange(Ranges.create(subName))
+      .function(function)
+      .export(export)
+      .description(createDescription(startNode.getSymbol()))
+      .parameters(createParameters(paramList))
+      .build();
+  }
+
   private Optional<MethodDescription> createDescription(Token token) {
     List<Token> comments = Trees.getComments(documentContext.getTokens(), token);
     if (comments.isEmpty()) {
@@ -159,4 +145,24 @@ private Optional<MethodDescription> createDescription(Token token) {
     return Optional.of(new MethodDescription(comments));
   }
 
+  private static List<ParameterDefinition> createParameters(@Nullable BSLParser.ParamListContext paramList) {
+    if (paramList == null) {
+      return Collections.emptyList();
+    }
+
+    return paramList.param().stream()
+      .map(param ->
+        ParameterDefinition.builder()
+          .name(getParameterName(param.IDENTIFIER()))
+          .byValue(param.VAL_KEYWORD() != null)
+          .optional(param.defaultValue() != null)
+          .build()
+      ).collect(Collectors.toList());
+  }
+
+  private static String getParameterName(TerminalNode identifier) {
+    return Optional.ofNullable(identifier)
+      .map(ParseTree::getText)
+      .orElse("<UNKNOWN_IDENTIFIER>");
+  }
 }

From 936b52d4133909233a3c70769a1748782db03bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Wed, 8 Apr 2020 09:02:34 +0300
Subject: [PATCH 003/444] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=B4=20mkdocs=20material=205?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mkdocs.en.yml | 12 ++++++++----
 mkdocs.yml    | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mkdocs.en.yml b/mkdocs.en.yml
index 5b577871237..fc4e2eaee09 100644
--- a/mkdocs.en.yml
+++ b/mkdocs.en.yml
@@ -15,12 +15,10 @@ theme:
     primary: 'white'
     accent: 'indigo'
 extra:
-  search:
-    language: 'en, ru'
   social:
-    - type: 'github'
+    - icon: fontawesome/brands/github
       link: 'https://github.com/1c-syntax'
-    - type: 'telegram'
+    - icon: fontawesome/brands/telegram
       link: 'https://t.me/bsl_language_server'
 extra_css:
   - 'assets/stylesheets/extra.css'
@@ -30,6 +28,12 @@ markdown_extensions:
   - toc:
       permalink: Link
 
+plugins:
+  - search:
+      lang:
+        - en
+        - ru
+
 site_url: 'https://1c-syntax.github.io/bsl-language-server'
 repo_name: '1c-syntax/bsl-language-server'
 repo_url: 'https://github.com/1c-syntax/bsl-language-server'
diff --git a/mkdocs.yml b/mkdocs.yml
index 40bda54d463..c418be1157b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -15,12 +15,10 @@ theme:
     primary: 'white'
     accent: 'indigo'
 extra:
-  search:
-    language: 'en, ru'
   social:
-    - type: 'github'
+    - icon: fontawesome/brands/github
       link: 'https://github.com/1c-syntax'
-    - type: 'telegram'
+    - icon: fontawesome/brands/telegram
       link: 'https://t.me/bsl_language_server'
 extra_css:
   - 'assets/stylesheets/extra.css'
@@ -30,6 +28,12 @@ markdown_extensions:
   - toc:
       permalink: true
 
+plugins:
+  - search:
+      lang:
+        - en
+        - ru
+
 site_url: 'https://1c-syntax.github.io/bsl-language-server'
 repo_name: '1c-syntax/bsl-language-server'
 repo_url: 'https://github.com/1c-syntax/bsl-language-server'

From fe5b2aa9d1711b1d70d5663702beff74cbb0ea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Wed, 8 Apr 2020 09:27:44 +0300
Subject: [PATCH 004/444] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=83=D0=B5=D1=85=D0=B0=D0=B2=D1=88=D0=B5=D0=B5?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/assets/stylesheets/extra.css | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/docs/assets/stylesheets/extra.css b/docs/assets/stylesheets/extra.css
index 8b4682f140c..ac4d06e2db3 100644
--- a/docs/assets/stylesheets/extra.css
+++ b/docs/assets/stylesheets/extra.css
@@ -1,19 +1,22 @@
 .md-content {
-  margin-right: 0;
+    margin-right: 0;
 }
+
 .md-sidebar--secondary {
-  margin-top: 220px;
-  margin-left: 12.1rem;
+    margin-top: 220px;
+    margin-left: 0.5rem;
 }
+
 .md-typeset__table {
-  padding: 0;
+    padding: 0;
 }
+
 .md-typeset table:not([class]) {
-  font-size: .54rem;
+    font-size: .54rem;
 }
 
 @media only screen and (min-width:59.9375em) and (max-width:80em) {
-  .md-sidebar--secondary {
-    display: none;
-  }
-}
+    .md-sidebar--secondary {
+        display: none;
+    }
+}
\ No newline at end of file

From 2835d9859d2eb73d59c7749a47de98327847bf8d Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Wed, 8 Apr 2020 14:24:58 +0700
Subject: [PATCH 005/444] Update extra.css

---
 docs/assets/stylesheets/extra.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/assets/stylesheets/extra.css b/docs/assets/stylesheets/extra.css
index ac4d06e2db3..c4ae4fa2c89 100644
--- a/docs/assets/stylesheets/extra.css
+++ b/docs/assets/stylesheets/extra.css
@@ -7,6 +7,11 @@
     margin-left: 0.5rem;
 }
 
+/* для отступа заголовка "Содержание" */
+.md-sidebar--secondary .md-nav__title {  
+    padding-left: 0px;
+}
+
 .md-typeset__table {
     padding: 0;
 }
@@ -19,4 +24,4 @@
     .md-sidebar--secondary {
         display: none;
     }
-}
\ No newline at end of file
+}

From 03b0563b6456756d8f6cedae3e3fe1c87b8c1247 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Thu, 9 Apr 2020 15:31:47 +0300
Subject: [PATCH 006/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedCurrentDate.md     | 50 ++++++++++
 docs/diagnostics/index.md                     |  5 +-
 docs/en/diagnostics/DeprecatedCurrentDate.md  | 52 +++++++++++
 docs/en/diagnostics/index.md                  |  5 +-
 .../DeprecatedCurrentDateDiagnostic.java      | 91 +++++++++++++++++++
 .../configuration/diagnostics-schema.json     | 10 ++
 .../languageserver/configuration/schema.json  |  3 +
 ...recatedCurrentDateDiagnostic_en.properties |  4 +
 ...recatedCurrentDateDiagnostic_ru.properties |  4 +
 .../DeprecatedCurrentDateDiagnosticTest.java  | 75 +++++++++++++++
 .../DeprecatedCurrentDateDiagnostic.bsl       | 13 +++
 11 files changed, 308 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/DeprecatedCurrentDate.md
 create mode 100644 docs/en/diagnostics/DeprecatedCurrentDate.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DeprecatedCurrentDateDiagnostic.bsl

diff --git a/docs/diagnostics/DeprecatedCurrentDate.md b/docs/diagnostics/DeprecatedCurrentDate.md
new file mode 100644
index 00000000000..8f6ebe8ab83
--- /dev/null
+++ b/docs/diagnostics/DeprecatedCurrentDate.md
@@ -0,0 +1,50 @@
+# Использование устаревшего метода "ТекущаяДата" (DeprecatedCurrentDate)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL` | `Важный` | `Да` | `1` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+
+Функция "ТекущаяДата" является устаревшей. Рекомендуется использовать функцию "ТекущаяДатаСеанса".
+
+## Примеры
+Неправильно:
+
+```bsl
+ДатаОперации = ТекущаяДата();
+```
+
+
+Правильно:
+
+```bsl
+ДатаОперации = ТекущаяДатаСеанса();
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* Источник: [Создание и изменение объектов метаданных. Работа в разных часовых поясах](https://its.1c.ru/db/v8std/content/643/hdoc)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:DeprecatedCurrentDate-off
+// BSLLS:DeprecatedCurrentDate-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"DeprecatedCurrentDate": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 573e91bbc65..714322ae9c1 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **85**
+Общее количество: **86**
 
 * Дефект кода: **54**
 * Уязвимость: **2**
-* Ошибка: **27**
+* Ошибка: **28**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -29,6 +29,7 @@
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
+| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
diff --git a/docs/en/diagnostics/DeprecatedCurrentDate.md b/docs/en/diagnostics/DeprecatedCurrentDate.md
new file mode 100644
index 00000000000..b1c426815ad
--- /dev/null
+++ b/docs/en/diagnostics/DeprecatedCurrentDate.md
@@ -0,0 +1,52 @@
+# Using of the deprecated method "CurrentDate" (DeprecatedCurrentDate)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Major` | `Yes` | `1` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+
+Method "CurrentDate" is deprecated. Use "CurrentSessionDate" instead.
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Incorrect:
+
+```bsl
+OperationDate = CurrentDate();
+```
+
+
+Correct:
+
+```bsl
+OperationDate = CurrentSessionDate();
+```
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* Reference: [Metadata creation and change. Work in different timezones](https://its.1c.ru/db/v8std/content/643/hdoc)
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:DeprecatedCurrentDate-off
+// BSLLS:DeprecatedCurrentDate-on
+```
+
+### Parameter for config
+
+```json
+"DeprecatedCurrentDate": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 1a93fcbc2b8..53c9f527dee 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **85**
+Total: **86**
 
-* Error: **27**
+* Error: **28**
 * Code smell: **54**
 * Vulnerability: **2**
 * Security Hotspot: **2**
@@ -29,6 +29,7 @@ Total: **85**
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
+| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
new file mode 100644
index 00000000000..0da8ef09873
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
@@ -0,0 +1,91 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.DiagnosticScope;
+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.providers.CodeActionProvider;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.eclipse.lsp4j.CodeAction;
+import org.eclipse.lsp4j.CodeActionParams;
+import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.TextEdit;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE
+  }
+
+)
+public class DeprecatedCurrentDateDiagnostic extends AbstractFindMethodDiagnostic implements QuickFixProvider {
+  private static final Pattern currentDatePattern = Pattern.compile(
+    "(текущаядата|currentdate)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public DeprecatedCurrentDateDiagnostic(DiagnosticInfo info) {
+    super(info, currentDatePattern);
+  }
+
+  @Override
+  protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
+    return false;
+  }
+
+  @Override
+  public List<CodeAction> getQuickFixes(
+    List<Diagnostic> diagnostics,
+    CodeActionParams params,
+    DocumentContext documentContext
+  ) {
+
+    List<TextEdit> textEdits = new ArrayList<>();
+
+    diagnostics.forEach((Diagnostic diagnostic) -> {
+      TextEdit textEdit = new TextEdit(diagnostic.getRange(), info.getResourceString("changeFix"));
+      textEdits.add(textEdit);
+    });
+
+    return CodeActionProvider.createCodeActions(
+      textEdits,
+      info.getResourceString("quickFixMessage"),
+      documentContext.getUri(),
+      diagnostics
+    );
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index eb14827c367..3dc40d9cd0a 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -160,6 +160,16 @@
             "title": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
             "$id": "#/definitions/DeletingCollectionItem"
         },
+        "DeprecatedCurrentDate": {
+            "description": "Using of the deprecated method \"CurrentDate\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Using of the deprecated method \"CurrentDate\"",
+            "$id": "#/definitions/DeprecatedCurrentDate"
+        },
         "DeprecatedFind": {
             "description": "Using of the deprecated method \"Find\"",
             "default": null,
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 3509853659b..b714b7bc2f0 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
@@ -137,6 +137,9 @@
                 "DeletingCollectionItem": {
                     "$ref": "diagnostics-schema.json#/definitions/DeletingCollectionItem"
                 },
+                "DeprecatedCurrentDate": {
+                    "$ref": "diagnostics-schema.json#/definitions/DeprecatedCurrentDate"
+                },
                 "DeprecatedFind": {
                     "$ref": "diagnostics-schema.json#/definitions/DeprecatedFind"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
new file mode 100644
index 00000000000..2c0494f5763
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
@@ -0,0 +1,4 @@
+changeFix=CurrentSessionDate
+diagnosticMessage=Use "CurrentSessionDate" instead of deprecated "CurrentDate"
+diagnosticName=Using of the deprecated method "CurrentDate"
+quickFixMessage=Replace to CurrentSessionDate
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
new file mode 100644
index 00000000000..72a7ece2ec4
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
@@ -0,0 +1,4 @@
+changeFix=ТекущаяДатаСеанса
+diagnosticMessage=Используйте "ТекущаяДатаСеанса" вместо устаревшего "ТекущаяДата"
+diagnosticName=Использование устаревшего метода "ТекущаяДата"
+quickFixMessage=Заменить на "ТекущаяДатаСеанса"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
new file mode 100644
index 00000000000..7c061bfb8ee
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
@@ -0,0 +1,75 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import org.eclipse.lsp4j.CodeAction;
+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 DeprecatedCurrentDateDiagnosticTest extends AbstractDiagnosticTest<DeprecatedCurrentDateDiagnostic> {
+  DeprecatedCurrentDateDiagnosticTest() {
+    super(DeprecatedCurrentDateDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(2, 19, 2, 30)
+      .hasRange(11, 16, 11, 27);
+
+  }
+
+  @Test
+  void testQuickFixes() {
+
+    final DocumentContext documentContext = getDocumentContext();
+    List<Diagnostic> diagnostics = getDiagnostics();
+    final Diagnostic diagnostic = diagnostics.get(0);
+    final String replacementText = "ТекущаяДатаСеанса";
+
+    List<CodeAction> QuickFixes = getQuickFixes(diagnostic);
+    assertThat(QuickFixes).hasSize(1);
+
+    final CodeAction quickFix = QuickFixes.get(0);
+
+    assertThat(quickFix)
+      .of(diagnosticInstance)
+      .in(documentContext)
+      .fixes(diagnostic);
+
+    assertThat(quickFix)
+      .in(documentContext)
+      .hasChanges(1)
+      .hasNewText(replacementText);
+
+  }
+
+}
diff --git a/src/test/resources/diagnostics/DeprecatedCurrentDateDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedCurrentDateDiagnostic.bsl
new file mode 100644
index 00000000000..2542499a06b
--- /dev/null
+++ b/src/test/resources/diagnostics/DeprecatedCurrentDateDiagnostic.bsl
@@ -0,0 +1,13 @@
+
+Процедура А()
+    ДатаПроверки = ТекущаяДата(); // Диагностика должна сработать здесь
+КонецПроцедуры
+
+Процедура Б()
+    ДатаПроверки = ТекущаяДатаСеанса();
+    Модуль.ТекущаяДата();
+КонецПроцедуры
+
+Procedure A()
+    CheckDate = CurrentDate(); // Диагностика должна сработать здесь
+EndProcedure
\ No newline at end of file

From 4513d90231d2b7b9e1553b15452704ad87e58c77 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Thu, 9 Apr 2020 16:56:31 +0300
Subject: [PATCH 007/444] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20quickF?=
 =?UTF-8?q?ix,=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedCurrentDate.md     |  2 +-
 docs/diagnostics/index.md                     |  2 +-
 docs/en/diagnostics/DeprecatedCurrentDate.md  |  2 +-
 docs/en/diagnostics/index.md                  |  2 +-
 .../DeprecatedCurrentDateDiagnostic.java      | 28 ++-----------------
 ...recatedCurrentDateDiagnostic_en.properties |  3 +-
 ...recatedCurrentDateDiagnostic_ru.properties |  3 +-
 .../DeprecatedCurrentDateDiagnosticTest.java  | 27 ------------------
 8 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/docs/diagnostics/DeprecatedCurrentDate.md b/docs/diagnostics/DeprecatedCurrentDate.md
index 8f6ebe8ab83..1709042e12b 100644
--- a/docs/diagnostics/DeprecatedCurrentDate.md
+++ b/docs/diagnostics/DeprecatedCurrentDate.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Ошибка` | `BSL` | `Важный` | `Да` | `1` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| `Ошибка` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`deprecated`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 714322ae9c1..1f246c6e30d 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -29,7 +29,7 @@
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
-| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
diff --git a/docs/en/diagnostics/DeprecatedCurrentDate.md b/docs/en/diagnostics/DeprecatedCurrentDate.md
index b1c426815ad..03c282d3862 100644
--- a/docs/en/diagnostics/DeprecatedCurrentDate.md
+++ b/docs/en/diagnostics/DeprecatedCurrentDate.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Major` | `Yes` | `1` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| `Error` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`deprecated`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 53c9f527dee..01ff325fefd 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -29,7 +29,7 @@ Total: **86**
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
-| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
index 0da8ef09873..1695355841f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
@@ -43,15 +43,15 @@
   type = DiagnosticType.ERROR,
   severity = DiagnosticSeverity.MAJOR,
   scope = DiagnosticScope.BSL,
-  minutesToFix = 1,
+  minutesToFix = 5,
   tags = {
     DiagnosticTag.STANDARD,
-    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.DEPRECATED,
     DiagnosticTag.UNPREDICTABLE
   }
 
 )
-public class DeprecatedCurrentDateDiagnostic extends AbstractFindMethodDiagnostic implements QuickFixProvider {
+public class DeprecatedCurrentDateDiagnostic extends AbstractFindMethodDiagnostic {
   private static final Pattern currentDatePattern = Pattern.compile(
     "(текущаядата|currentdate)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
@@ -66,26 +66,4 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
     return false;
   }
 
-  @Override
-  public List<CodeAction> getQuickFixes(
-    List<Diagnostic> diagnostics,
-    CodeActionParams params,
-    DocumentContext documentContext
-  ) {
-
-    List<TextEdit> textEdits = new ArrayList<>();
-
-    diagnostics.forEach((Diagnostic diagnostic) -> {
-      TextEdit textEdit = new TextEdit(diagnostic.getRange(), info.getResourceString("changeFix"));
-      textEdits.add(textEdit);
-    });
-
-    return CodeActionProvider.createCodeActions(
-      textEdits,
-      info.getResourceString("quickFixMessage"),
-      documentContext.getUri(),
-      diagnostics
-    );
-  }
-
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
index 2c0494f5763..94e8e0bd00e 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_en.properties
@@ -1,4 +1,3 @@
-changeFix=CurrentSessionDate
 diagnosticMessage=Use "CurrentSessionDate" instead of deprecated "CurrentDate"
 diagnosticName=Using of the deprecated method "CurrentDate"
-quickFixMessage=Replace to CurrentSessionDate
+
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
index 72a7ece2ec4..3b3e3a3f0ca 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic_ru.properties
@@ -1,4 +1,3 @@
-changeFix=ТекущаяДатаСеанса
 diagnosticMessage=Используйте "ТекущаяДатаСеанса" вместо устаревшего "ТекущаяДата"
 diagnosticName=Использование устаревшего метода "ТекущаяДата"
-quickFixMessage=Заменить на "ТекущаяДатаСеанса"
+
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
index 7c061bfb8ee..93e253b7c92 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnosticTest.java
@@ -21,8 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
-import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
@@ -47,29 +45,4 @@ void test() {
 
   }
 
-  @Test
-  void testQuickFixes() {
-
-    final DocumentContext documentContext = getDocumentContext();
-    List<Diagnostic> diagnostics = getDiagnostics();
-    final Diagnostic diagnostic = diagnostics.get(0);
-    final String replacementText = "ТекущаяДатаСеанса";
-
-    List<CodeAction> QuickFixes = getQuickFixes(diagnostic);
-    assertThat(QuickFixes).hasSize(1);
-
-    final CodeAction quickFix = QuickFixes.get(0);
-
-    assertThat(quickFix)
-      .of(diagnosticInstance)
-      .in(documentContext)
-      .fixes(diagnostic);
-
-    assertThat(quickFix)
-      .in(documentContext)
-      .hasChanges(1)
-      .hasNewText(replacementText);
-
-  }
-
 }

From a5facba85096122cf5be2ef0085e0d8a8d0a15b1 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 9 Apr 2020 22:04:02 +0300
Subject: [PATCH 008/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B1=D1=8B=D1=82=D1=83=D1=8E=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D1=83=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20AST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/FastStart.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/contributing/FastStart.md b/docs/contributing/FastStart.md
index dfe1dab3cb0..04e325cd8b4 100644
--- a/docs/contributing/FastStart.md
+++ b/docs/contributing/FastStart.md
@@ -23,7 +23,10 @@
 2. Склонировать в созданный каталог репозиторий проекта `https://github.com/1c-syntax/bsl-parser.git`
 3. Выполнить настройку окружения по [инструкции](EnvironmentSetting.md) _(если ранее не выполнялась)_
 4. Установить плагин `ANTLR v4 grammar plugin`
-5. Открыть файл `build.gradle.kts` из каталога проекта, согласиться с импортом зависимостей, дождаться их скачивания
-6. Открыть файл `src/main/antlr/BSLParser.g4`
-7. Установить курсор на любую строку с кодом _(не комментарий)_ и выбрать пункт контекстного меню `Test Rule file`
-8. В открывшемся окне выбрать bsl-файл либо вставить текст из буфера обмена
+  - перезапустить IDEA при необходимости
+5. Настроить плагин -  `File | Settings | Languages & Frameworks | ANTLR v4 default project settings` `ANTLR v4 grammar plugin`
+  - Установить настройку `Case transformation in the Preview window` в `Transform to uppercase when lexing`
+6. Открыть файл `build.gradle.kts` из каталога проекта, согласиться с импортом зависимостей, дождаться их скачивания
+7. Открыть файл `src/main/antlr/BSLParser.g4`
+8. Установить курсор на любую строку с кодом _(не комментарий)_ и выбрать пункт контекстного меню `Test Rule file`
+9. В открывшемся окне выбрать bsl-файл либо вставить текст из буфера обмена

From e929547fcec98efe6c24c36f1c2c81596fa7599f Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 10 Apr 2020 11:33:37 +0300
Subject: [PATCH 009/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MissingVariablesDescriptionDiagnostic.md  | 52 +++++++++++++++
 docs/diagnostics/index.md                     |  5 +-
 .../MissingVariablesDescriptionDiagnostic.md  | 51 +++++++++++++++
 docs/en/diagnostics/index.md                  |  5 +-
 .../context/symbol/SymbolTree.java            | 24 +++++++
 ...iablesDescriptionDiagnosticDiagnostic.java | 63 +++++++++++++++++++
 .../configuration/diagnostics-schema.json     | 10 +++
 .../languageserver/configuration/schema.json  |  3 +
 ...criptionDiagnosticDiagnostic_en.properties |  2 +
 ...criptionDiagnosticDiagnostic_ru.properties |  2 +
 ...esDescriptionDiagnosticDiagnosticTest.java | 46 ++++++++++++++
 ...riablesDescriptionDiagnosticDiagnostic.bsl |  4 ++
 12 files changed, 263 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/MissingVariablesDescriptionDiagnostic.md
 create mode 100644 docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl

diff --git a/docs/diagnostics/MissingVariablesDescriptionDiagnostic.md b/docs/diagnostics/MissingVariablesDescriptionDiagnostic.md
new file mode 100644
index 00000000000..4cfdb7895cb
--- /dev/null
+++ b/docs/diagnostics/MissingVariablesDescriptionDiagnostic.md
@@ -0,0 +1,52 @@
+# Все объявления переменных должны иметь описание (MissingVariablesDescriptionDiagnostic)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Незначительный` | `Да` | `5` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+Все переменные модулей, а также все экспортируемые переменные должны иметь комментарии. Комментарии ставятся в той же строке после переменной.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Примеры
+Неправильно:
+
+```bsl
+Перем Контекст;
+```
+
+Правильно:
+
+```bsl
+Перем Контекст; // Некое подробное описание, которое объясняет назначение переменной
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* Источник: [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc )
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:MissingVariablesDescriptionDiagnostic-off
+// BSLLS:MissingVariablesDescriptionDiagnostic-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"MissingVariablesDescriptionDiagnostic": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 1f246c6e30d..327c36740fa 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **86**
+Общее количество: **87**
 
-* Дефект кода: **54**
+* Дефект кода: **55**
 * Уязвимость: **2**
 * Ошибка: **28**
 * Потенциальная уязвимость: **2**
@@ -54,6 +54,7 @@
 | [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Конструкция "Попытка...Исключение...КонецПопытки" не содержит кода в исключении | Да | Важный | Ошибка | `standard`<br/>`badpractice` |
 | [MissingSpace](MissingSpace.md) | Пропущены пробелы слева или справа от операторов `+ - * / = % < > <> <= >=`, а так же справа от `,` и `;` | Да | Информационный | Дефект кода | `badpractice` |
 | [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Отсутствует удаление временного файла после использования | Да | Важный | Ошибка | `badpractice`<br/>`standard` |
+| [MissingVariablesDescriptionDiagnostic](MissingVariablesDescriptionDiagnostic.md) | Все объявления переменных должны иметь описание | Да | Незначительный | Дефект кода | `standard` |
 | [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | Есть локализованный текст для всех заявленных в конфигурации языков | Да | Незначительный | Ошибка | `error`<br/>`localize` |
 | [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Частично локализованный текст используется в функции СтрШаблон | Да | Важный | Ошибка | `error`<br/>`localize` |
 | [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Использование конструкторов с параметрами при объявлении структуры | Да | Незначительный | Дефект кода | `badpractice`<br/>`brainoverload` |
diff --git a/docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md b/docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md
new file mode 100644
index 00000000000..7ed4dd0e39f
--- /dev/null
+++ b/docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md
@@ -0,0 +1,51 @@
+# All variables declarations must have a description (MissingVariablesDescriptionDiagnostic)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `5` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+All module variables and export variables, must have comments. Comments are placed on the same line after the variable.
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+Incorrect:
+
+```bsl
+Var Context;
+```
+
+Correct:
+
+```bsl
+Var Context; // Detailed description that explains the purpose of the variable
+```
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:MissingVariablesDescriptionDiagnostic-off
+// BSLLS:MissingVariablesDescriptionDiagnostic-on
+```
+
+### Parameter for config
+
+```json
+"MissingVariablesDescriptionDiagnostic": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 01ff325fefd..c272aae6e75 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **86**
+Total: **87**
 
 * Error: **28**
-* Code smell: **54**
+* Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -54,6 +54,7 @@ Total: **86**
 | [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Missing code in Raise block in "Try ... Raise ... EndTry" | Yes | Major | Error | `standard`<br/>`badpractice` |
 | [MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice` |
 | [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br/>`standard` |
+| [MissingVariablesDescriptionDiagnostic](MissingVariablesDescriptionDiagnostic.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard` |
 | [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br/>`localize` |
 | [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br/>`localize` |
 | [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br/>`brainoverload` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
index b37a545968d..d58da5a8515 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
@@ -88,6 +88,30 @@ public Optional<MethodSymbol> getMethodSymbol(BSLParserRuleContext ctx) {
       .findAny();
   }
 
+  public List<VariableSymbol> getVariables() {
+    return getChildrenFlat(VariableSymbol.class);
+  }
+
+  public Optional<VariableSymbol> getVariableSymbol(BSLParserRuleContext ctx) {
+
+    BSLParserRuleContext varNameNode;
+
+    if (Trees.nodeContainsErrors(ctx)) {
+      varNameNode = ctx;
+    } else if (ctx instanceof BSLParser.ModuleVarDeclarationContext) {
+      varNameNode = ((BSLParser.ModuleVarDeclarationContext) ctx).var_name();
+    } else if (ctx instanceof BSLParser.SubVarDeclarationContext) {
+      varNameNode = ((BSLParser.SubVarDeclarationContext) ctx).var_name();
+    } else {
+      varNameNode = ctx;
+    }
+
+    Range variableNameRange = Ranges.create(varNameNode);
+
+    return getVariables().stream()
+      .filter(variableSymbol -> variableSymbol.getVariableNameRange().equals(variableNameRange))
+      .findAny();
+  }
 
   private List<Symbol> getSelfAndChildrenRecursive(Symbol symbol) {
     var list = new ArrayList<Symbol>();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java
new file mode 100644
index 00000000000..2d80b0cdcc9
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java
@@ -0,0 +1,63 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
+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.parser.BSLParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.MINOR,
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class MissingVariablesDescriptionDiagnosticDiagnostic extends AbstractVisitorDiagnostic {
+  public MissingVariablesDescriptionDiagnosticDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitModuleVarDeclaration(BSLParser.ModuleVarDeclarationContext ctx) {
+    documentContext
+      .getSymbolTree()
+      .getVariableSymbol(ctx)
+      .flatMap(VariableSymbol::getDescription)
+      .ifPresent(variableDescription -> {
+        if (variableDescription.getTrailingDescription().isEmpty()){
+          diagnosticStorage.addDiagnostic(ctx);
+        }
+      }
+      );
+
+    return ctx;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 3dc40d9cd0a..bcd3395e736 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -504,6 +504,16 @@
             },
             "$id": "#/definitions/MissingTemporaryFileDeletion"
         },
+        "MissingVariablesDescriptionDiagnostic": {
+            "description": "All variables declarations must have a description",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "All variables declarations must have a description",
+            "$id": "#/definitions/MissingVariablesDescriptionDiagnostic"
+        },
         "MultilingualStringHasAllDeclaredLanguages": {
             "description": "There is a localized text for all languages declared in the configuration",
             "default": null,
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 b714b7bc2f0..4b88b584286 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
@@ -212,6 +212,9 @@
                 "MissingTemporaryFileDeletion": {
                     "$ref": "diagnostics-schema.json#/definitions/MissingTemporaryFileDeletion"
                 },
+                "MissingVariablesDescriptionDiagnostic": {
+                    "$ref": "diagnostics-schema.json#/definitions/MissingVariablesDescriptionDiagnostic"
+                },
                 "MultilingualStringHasAllDeclaredLanguages": {
                     "$ref": "diagnostics-schema.json#/definitions/MultilingualStringHasAllDeclaredLanguages"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties
new file mode 100644
index 00000000000..d553b7c926f
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Add a description of the variable
+diagnosticName=All variables declarations must have a description
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties
new file mode 100644
index 00000000000..44f3007a379
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Добавьте описание переменной
+diagnosticName=Все объявления переменных должны иметь описание
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
new file mode 100644
index 00000000000..5f2d064f01a
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
@@ -0,0 +1,46 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class MissingVariablesDescriptionDiagnosticDiagnosticTest extends AbstractDiagnosticTest<MissingVariablesDescriptionDiagnosticDiagnostic> {
+  MissingVariablesDescriptionDiagnosticDiagnosticTest() {
+    super(MissingVariablesDescriptionDiagnosticDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(1, 6, 1, 27);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl b/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl
new file mode 100644
index 00000000000..4adb1b20ec1
--- /dev/null
+++ b/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl
@@ -0,0 +1,4 @@
+// Диагностика сработает здесь
+Перем ПеременнаяБезОписания;
+
+Перем ПеременнаяСОписанием; // Диагностика здесь не сработает
\ No newline at end of file

From 1fa64437f48a22e7858f67f420812739203b6134 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 10 Apr 2020 14:32:40 +0300
Subject: [PATCH 010/444] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8,=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=20PR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...stic.md => MissingVariablesDescription.md} | 17 ++++++++------
 docs/diagnostics/index.md                     |  2 +-
 ...stic.md => MissingVariablesDescription.md} | 15 ++++++++-----
 docs/en/diagnostics/index.md                  |  2 +-
 .../computer/VariableSymbolComputer.java      |  4 ----
 ...issingVariablesDescriptionDiagnostic.java} | 10 +++++----
 .../configuration/diagnostics-schema.json     |  4 ++--
 .../languageserver/configuration/schema.json  |  4 ++--
 ...iablesDescriptionDiagnostic_en.properties} |  0
 ...iablesDescriptionDiagnostic_ru.properties} |  0
 ...esDescriptionDiagnosticDiagnosticTest.java | 11 ++++++----
 .../MissingVariablesDescriptionDiagnostic.bsl | 22 +++++++++++++++++++
 ...riablesDescriptionDiagnosticDiagnostic.bsl |  4 ----
 13 files changed, 60 insertions(+), 35 deletions(-)
 rename docs/diagnostics/{MissingVariablesDescriptionDiagnostic.md => MissingVariablesDescription.md} (84%)
 rename docs/en/diagnostics/{MissingVariablesDescriptionDiagnostic.md => MissingVariablesDescription.md} (83%)
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/{MissingVariablesDescriptionDiagnosticDiagnostic.java => MissingVariablesDescriptionDiagnostic.java} (87%)
 rename src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/{MissingVariablesDescriptionDiagnosticDiagnostic_en.properties => MissingVariablesDescriptionDiagnostic_en.properties} (100%)
 rename src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/{MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties => MissingVariablesDescriptionDiagnostic_ru.properties} (100%)
 create mode 100644 src/test/resources/diagnostics/MissingVariablesDescriptionDiagnostic.bsl
 delete mode 100644 src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl

diff --git a/docs/diagnostics/MissingVariablesDescriptionDiagnostic.md b/docs/diagnostics/MissingVariablesDescription.md
similarity index 84%
rename from docs/diagnostics/MissingVariablesDescriptionDiagnostic.md
rename to docs/diagnostics/MissingVariablesDescription.md
index 4cfdb7895cb..6de1e307d85 100644
--- a/docs/diagnostics/MissingVariablesDescriptionDiagnostic.md
+++ b/docs/diagnostics/MissingVariablesDescription.md
@@ -1,13 +1,13 @@
-# Все объявления переменных должны иметь описание (MissingVariablesDescriptionDiagnostic)
+# Все объявления переменных должны иметь описание (MissingVariablesDescription)
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Незначительный` | `Да` | `5` | `standard` |
+| `Дефект кода` | `BSL`<br/>`OS` | `Незначительный` | `Да` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-Все переменные модулей, а также все экспортируемые переменные должны иметь комментарии. Комментарии ставятся в той же строке после переменной.
+Все переменные модулей, а также все экспортируемые переменные должны иметь комментарии.
 
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
@@ -23,6 +23,9 @@
 
 ```bsl
 Перем Контекст; // Некое подробное описание, которое объясняет назначение переменной
+
+// Некое подробное описание, которое объясняет назначение переменной
+Перем Контекст;
 ```
 
 ## Источники
@@ -33,7 +36,7 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
-* Источник: [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc )
+* Источник: [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Сниппеты
 
@@ -41,12 +44,12 @@
 ### Экранирование кода
 
 ```bsl
-// BSLLS:MissingVariablesDescriptionDiagnostic-off
-// BSLLS:MissingVariablesDescriptionDiagnostic-on
+// BSLLS:MissingVariablesDescription-off
+// BSLLS:MissingVariablesDescription-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"MissingVariablesDescriptionDiagnostic": false
+"MissingVariablesDescription": false
 ```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 327c36740fa..53ae4ea5032 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -54,7 +54,7 @@
 | [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Конструкция "Попытка...Исключение...КонецПопытки" не содержит кода в исключении | Да | Важный | Ошибка | `standard`<br/>`badpractice` |
 | [MissingSpace](MissingSpace.md) | Пропущены пробелы слева или справа от операторов `+ - * / = % < > <> <= >=`, а так же справа от `,` и `;` | Да | Информационный | Дефект кода | `badpractice` |
 | [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Отсутствует удаление временного файла после использования | Да | Важный | Ошибка | `badpractice`<br/>`standard` |
-| [MissingVariablesDescriptionDiagnostic](MissingVariablesDescriptionDiagnostic.md) | Все объявления переменных должны иметь описание | Да | Незначительный | Дефект кода | `standard` |
+| [MissingVariablesDescription](MissingVariablesDescription.md) | Все объявления переменных должны иметь описание | Да | Незначительный | Дефект кода | `standard` |
 | [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | Есть локализованный текст для всех заявленных в конфигурации языков | Да | Незначительный | Ошибка | `error`<br/>`localize` |
 | [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Частично локализованный текст используется в функции СтрШаблон | Да | Важный | Ошибка | `error`<br/>`localize` |
 | [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Использование конструкторов с параметрами при объявлении структуры | Да | Незначительный | Дефект кода | `badpractice`<br/>`brainoverload` |
diff --git a/docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md b/docs/en/diagnostics/MissingVariablesDescription.md
similarity index 83%
rename from docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md
rename to docs/en/diagnostics/MissingVariablesDescription.md
index 7ed4dd0e39f..489a9e55df2 100644
--- a/docs/en/diagnostics/MissingVariablesDescriptionDiagnostic.md
+++ b/docs/en/diagnostics/MissingVariablesDescription.md
@@ -1,14 +1,14 @@
-# All variables declarations must have a description (MissingVariablesDescriptionDiagnostic)
+# All variables declarations must have a description (MissingVariablesDescription)
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `5` | `standard` |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-All module variables and export variables, must have comments. Comments are placed on the same line after the variable.
+All module variables and export variables must have comments.
 
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
@@ -22,6 +22,9 @@ Correct:
 
 ```bsl
 Var Context; // Detailed description that explains the purpose of the variable
+
+// Detailed description that explains the purpose of the variable
+Var Context;
 ```
 
 ## Sources
@@ -40,12 +43,12 @@ Var Context; // Detailed description that explains the purpose of the variable
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:MissingVariablesDescriptionDiagnostic-off
-// BSLLS:MissingVariablesDescriptionDiagnostic-on
+// BSLLS:MissingVariablesDescription-off
+// BSLLS:MissingVariablesDescription-on
 ```
 
 ### Parameter for config
 
 ```json
-"MissingVariablesDescriptionDiagnostic": false
+"MissingVariablesDescription": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index c272aae6e75..246b94d7e89 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -54,7 +54,7 @@ Total: **87**
 | [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Missing code in Raise block in "Try ... Raise ... EndTry" | Yes | Major | Error | `standard`<br/>`badpractice` |
 | [MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice` |
 | [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br/>`standard` |
-| [MissingVariablesDescriptionDiagnostic](MissingVariablesDescriptionDiagnostic.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard` |
+| [MissingVariablesDescription](MissingVariablesDescription.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard` |
 | [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br/>`localize` |
 | [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br/>`localize` |
 | [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br/>`brainoverload` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
index d17795f8005..c787509ae39 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
@@ -87,11 +87,7 @@ private VariableSymbol createVariableSymbol(
 
   private Optional<VariableDescription> createDescription(Token token) {
     List<Token> tokens = documentContext.getTokens();
-
     List<Token> comments = Trees.getComments(tokens, token);
-    if (comments.isEmpty()) {
-      return Optional.empty();
-    }
 
     String commentsText = comments.stream().map(Token::getText).reduce("", String::concat);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
similarity index 87%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
index 2d80b0cdcc9..423d281d248 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
@@ -33,25 +33,27 @@
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.MINOR,
-  minutesToFix = 5,
+  minutesToFix = 1,
   tags = {
     DiagnosticTag.STANDARD
   }
 
 )
-public class MissingVariablesDescriptionDiagnosticDiagnostic extends AbstractVisitorDiagnostic {
-  public MissingVariablesDescriptionDiagnosticDiagnostic(DiagnosticInfo info) {
+public class MissingVariablesDescriptionDiagnostic extends AbstractVisitorDiagnostic {
+  public MissingVariablesDescriptionDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
   public ParseTree visitModuleVarDeclaration(BSLParser.ModuleVarDeclarationContext ctx) {
+
     documentContext
       .getSymbolTree()
       .getVariableSymbol(ctx)
       .flatMap(VariableSymbol::getDescription)
       .ifPresent(variableDescription -> {
-        if (variableDescription.getTrailingDescription().isEmpty()){
+        if (variableDescription.getDescription().isEmpty()
+          && variableDescription.getTrailingDescription().isEmpty()) {
           diagnosticStorage.addDiagnostic(ctx);
         }
       }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index bcd3395e736..e50e2182208 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -504,7 +504,7 @@
             },
             "$id": "#/definitions/MissingTemporaryFileDeletion"
         },
-        "MissingVariablesDescriptionDiagnostic": {
+        "MissingVariablesDescription": {
             "description": "All variables declarations must have a description",
             "default": null,
             "type": [
@@ -512,7 +512,7 @@
                 "object"
             ],
             "title": "All variables declarations must have a description",
-            "$id": "#/definitions/MissingVariablesDescriptionDiagnostic"
+            "$id": "#/definitions/MissingVariablesDescription"
         },
         "MultilingualStringHasAllDeclaredLanguages": {
             "description": "There is a localized text for all languages declared in the configuration",
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 4b88b584286..f31df27a92d 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
@@ -212,8 +212,8 @@
                 "MissingTemporaryFileDeletion": {
                     "$ref": "diagnostics-schema.json#/definitions/MissingTemporaryFileDeletion"
                 },
-                "MissingVariablesDescriptionDiagnostic": {
-                    "$ref": "diagnostics-schema.json#/definitions/MissingVariablesDescriptionDiagnostic"
+                "MissingVariablesDescription": {
+                    "$ref": "diagnostics-schema.json#/definitions/MissingVariablesDescription"
                 },
                 "MultilingualStringHasAllDeclaredLanguages": {
                     "$ref": "diagnostics-schema.json#/definitions/MultilingualStringHasAllDeclaredLanguages"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic_en.properties
similarity index 100%
rename from src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_en.properties
rename to src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic_en.properties
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic_ru.properties
similarity index 100%
rename from src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic_ru.properties
rename to src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic_ru.properties
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
index 5f2d064f01a..6d0ab8c6454 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
@@ -28,9 +28,9 @@
 
 import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
 
-class MissingVariablesDescriptionDiagnosticDiagnosticTest extends AbstractDiagnosticTest<MissingVariablesDescriptionDiagnosticDiagnostic> {
+class MissingVariablesDescriptionDiagnosticDiagnosticTest extends AbstractDiagnosticTest<MissingVariablesDescriptionDiagnostic> {
   MissingVariablesDescriptionDiagnosticDiagnosticTest() {
-    super(MissingVariablesDescriptionDiagnosticDiagnostic.class);
+    super(MissingVariablesDescriptionDiagnostic.class);
   }
 
   @Test
@@ -38,9 +38,12 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics).hasSize(4);
     assertThat(diagnostics, true)
-      .hasRange(1, 6, 1, 27);
+      .hasRange(1, 6, 1, 27)
+      .hasRange(3, 6, 3, 45)
+      .hasRange(17, 6, 17, 38)
+      .hasRange(21, 6, 21, 56);
 
   }
 }
diff --git a/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnostic.bsl b/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnostic.bsl
new file mode 100644
index 00000000000..fadeb3074e6
--- /dev/null
+++ b/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnostic.bsl
@@ -0,0 +1,22 @@
+
+Перем ПеременнаяБезОписания;
+
+Перем ЭкспортнаяПеременнаяБезОписания Экспорт;
+
+Перем ПеременнаяСОписанием; // описание
+
+Перем ЭкспортнаяПеременнаяСОписанием Экспорт; // описание
+
+// описание
+Перем ПеременнаяСОписаниемВыше;
+
+// описание
+Перем ЭкспортнаяПеременнаяСОписаниемВыше Экспорт;
+
+ // неточное описание
+
+Перем ПеременнаяСНевернымОписаниемВыше;
+
+ // неточное описание
+
+Перем ЭкспортнаяПеременнаяСНевернымОписаниемВыше Экспорт;
diff --git a/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl b/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl
deleted file mode 100644
index 4adb1b20ec1..00000000000
--- a/src/test/resources/diagnostics/MissingVariablesDescriptionDiagnosticDiagnostic.bsl
+++ /dev/null
@@ -1,4 +0,0 @@
-// Диагностика сработает здесь
-Перем ПеременнаяБезОписания;
-
-Перем ПеременнаяСОписанием; // Диагностика здесь не сработает
\ No newline at end of file

From 2154f6c2f34e5e6e6c9e2e64492a6a676aaa023e Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 10 Apr 2020 20:32:20 +0700
Subject: [PATCH 011/444] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=80=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/bechmark.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/scripts/bechmark.py

diff --git a/.github/scripts/bechmark.py b/.github/scripts/bechmark.py
new file mode 100644
index 00000000000..e515afdce7b
--- /dev/null
+++ b/.github/scripts/bechmark.py
@@ -0,0 +1,29 @@
+import pytest
+import os
+import re
+import ntpath
+
+pattern = r"bsl.+\.jar"
+dirName = os.getcwd() + "/build/libs"  
+
+def test_analyze_ssl31(benchmark):
+    benchmark(some_func, None)
+
+def some_func(arg):
+    fullname = get_bslls_jar(dirName)
+    cmdArgs = ['java']
+    cmdArgs.append('-jar')
+    cmdArgs.append(dirName + '/' + fullname)
+    cmdArgs.append('-a')
+    cmdArgs.append('-s')
+    cmdArgs.append('ssl')
+    cmd = ' '.join(cmdArgs) 
+    os.system(cmd)
+
+def get_bslls_jar(dir):
+    names = os.listdir(dir)
+    for name in names:
+        fullname = os.path.join(dir, name)
+        if os.path.isfile(fullname) and re.search(pattern, fullname) and fullname.find('sources.jar') == -1 and fullname.find('javadoc.jar') == -1:
+            return ntpath.basename(fullname)
+    return None

From 2c9073f717fcafc4e447e92b9e39afe0f6140d83 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 10 Apr 2020 20:32:32 +0700
Subject: [PATCH 012/444] =?UTF-8?q?=D0=92=D0=BE=D1=80=D0=BA=D1=84=D0=BB?=
 =?UTF-8?q?=D0=BE=D1=83=20=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/bechmark.yml | 64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 .github/workflows/bechmark.yml

diff --git a/.github/workflows/bechmark.yml b/.github/workflows/bechmark.yml
new file mode 100644
index 00000000000..c1fecdb24dc
--- /dev/null
+++ b/.github/workflows/bechmark.yml
@@ -0,0 +1,64 @@
+name: Benchmark
+
+on:
+  push: 
+    branches:
+      - develop
+      - master
+  pull_request:
+
+jobs:
+  Benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+
+      - name: Setup JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Build with Gradle
+        run: ./gradlew jar
+
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.7'
+
+      - name: Setup pytest-benchmark
+        run: pip install pytest pytest-benchmark
+
+      - name: Download SSL 3.1
+        run: git clone https://github.com/1c-syntax/ssl_3_1.git ssl
+
+      - name: Analyze ssl
+        run: pytest .github/scripts/bechmark.py --benchmark-min-rounds=1 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
+
+      - name: Check benchmark result for pull request
+        if: github.event_name == 'pull_request'
+        uses: otymko/github-action-benchmark@v1
+        with:
+          name: BSL LS perfomance measurement (SSL 3.1)
+          tool: 'pytest'
+          output-file-path: output.json
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          alert-threshold: '10%'
+          comment-on-alert: true
+          fail-on-alert: true
+          alert-comment-cc-users: '@otymko'
+
+      - name: Store benchmark result into branch
+        if: github.event_name == 'push'
+        uses: otymko/github-action-benchmark@v1
+        with:
+          name: BSL LS perfomance measurement (SSL 3.1)
+          tool: 'pytest'
+          output-file-path: output.json
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          auto-push: true
+          alert-threshold: '10%'
+          comment-on-alert: true
+          fail-on-alert: true
+          alert-comment-cc-users: '@otymko'

From 4823ad129c82bdbbb1c6efec96e2f862d5f45e8c Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 10 Apr 2020 20:32:45 +0700
Subject: [PATCH 013/444] =?UTF-8?q?=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B2=20readme=20=D0=B8=20=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=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md        | 2 ++
 docs/en/index.md | 2 ++
 docs/index.md    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index f29d1f6ec3f..08a460d11bb 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@
 
 Сайт проекта - https://1c-syntax.github.io/bsl-language-server
 
+Замеры производительности - [SSL 3.1](https://1c-syntax.github.io/bsl-language-serve/bench/index.html)
+
 [English version](docs/en/index.md)
 
 ## Возможности
diff --git a/docs/en/index.md b/docs/en/index.md
index 3b2b4f08865..823698fdf6d 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -25,6 +25,8 @@
 
 <a id="capabilities"></a>
 
+Perfomance measurement - [SSL 3.1](bench/index.html)
+
 ## Capabilities
 
 - File formatting
diff --git a/docs/index.md b/docs/index.md
index 083e8ab4c1a..e0b3101bb1e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -25,6 +25,8 @@
 
 <a id="capabilities"></a>
 
+Замеры производительности - [SSL 3.1](bench/index.html)
+
 ## Возможности
 
 * Форматирование файла

From a169a5af6d95aced6084df4e06c814d0f94a4bba Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 10 Apr 2020 18:14:29 +0300
Subject: [PATCH 014/444] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80,=20=D1=81=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/VariableSymbolComputer.java      |  7 ++-
 ...MissingVariablesDescriptionDiagnostic.java | 10 +---
 ...esDescriptionDiagnosticDiagnosticTest.java | 49 -------------------
 3 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
index c787509ae39..b668f25d21f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
@@ -88,10 +88,15 @@ private VariableSymbol createVariableSymbol(
   private Optional<VariableDescription> createDescription(Token token) {
     List<Token> tokens = documentContext.getTokens();
     List<Token> comments = Trees.getComments(tokens, token);
+    Optional<Token> trailingComments = Trees.getTrailingComment(tokens, token);
+
+    if (comments.isEmpty() && trailingComments.isEmpty()) {
+      return Optional.empty();
+    }
 
     String commentsText = comments.stream().map(Token::getText).reduce("", String::concat);
 
-    var trailingDescription = Trees.getTrailingComment(tokens, token)
+    var trailingDescription = trailingComments
       .map(trailingComment -> VariableDescription.builder()
         .description(trailingComment.getText())
         .range(Ranges.create(trailingComment))
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
index 423d281d248..8dfecd6e396 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
@@ -50,14 +50,8 @@ public ParseTree visitModuleVarDeclaration(BSLParser.ModuleVarDeclarationContext
     documentContext
       .getSymbolTree()
       .getVariableSymbol(ctx)
-      .flatMap(VariableSymbol::getDescription)
-      .ifPresent(variableDescription -> {
-        if (variableDescription.getDescription().isEmpty()
-          && variableDescription.getTrailingDescription().isEmpty()) {
-          diagnosticStorage.addDiagnostic(ctx);
-        }
-      }
-      );
+      .filter(variableSymbol -> variableSymbol.getDescription().isEmpty())
+      .ifPresent(noneDescription -> diagnosticStorage.addDiagnostic(ctx));
 
     return ctx;
   }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
deleted file mode 100644
index 6d0ab8c6454..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticDiagnosticTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
-
-class MissingVariablesDescriptionDiagnosticDiagnosticTest extends AbstractDiagnosticTest<MissingVariablesDescriptionDiagnostic> {
-  MissingVariablesDescriptionDiagnosticDiagnosticTest() {
-    super(MissingVariablesDescriptionDiagnostic.class);
-  }
-
-  @Test
-  void test() {
-
-    List<Diagnostic> diagnostics = getDiagnostics();
-
-    assertThat(diagnostics).hasSize(4);
-    assertThat(diagnostics, true)
-      .hasRange(1, 6, 1, 27)
-      .hasRange(3, 6, 3, 45)
-      .hasRange(17, 6, 17, 38)
-      .hasRange(21, 6, 21, 56);
-
-  }
-}

From 7d097c42a787d4fd4bc98fa14d4a3f7f144ba291 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 10 Apr 2020 18:37:46 +0300
Subject: [PATCH 015/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=82=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ingVariablesDescriptionDiagnosticTest.java | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticTest.java

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticTest.java
new file mode 100644
index 00000000000..72b12244d64
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnosticTest.java
@@ -0,0 +1,49 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class MissingVariablesDescriptionDiagnosticTest extends AbstractDiagnosticTest<MissingVariablesDescriptionDiagnostic> {
+  MissingVariablesDescriptionDiagnosticTest() {
+    super(MissingVariablesDescriptionDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(4);
+    assertThat(diagnostics, true)
+      .hasRange(1, 6, 1, 27)
+      .hasRange(3, 6, 3, 45)
+      .hasRange(17, 6, 17, 38)
+      .hasRange(21, 6, 21, 56);
+
+  }
+}

From 3f93459039c1d702a3a38ed25f1fc31e9e7e10d4 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 02:18:36 +0700
Subject: [PATCH 016/444] =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B1=D0=B5=D0=B9=D0=B4=D0=B6=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=B5=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D1=85=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/gen-bandge.py  | 13 +++++++++++++
 .github/workflows/bechmark.yml | 32 ++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 .github/scripts/gen-bandge.py

diff --git a/.github/scripts/gen-bandge.py b/.github/scripts/gen-bandge.py
new file mode 100644
index 00000000000..2195d8385f3
--- /dev/null
+++ b/.github/scripts/gen-bandge.py
@@ -0,0 +1,13 @@
+import json
+from pybadges import badge
+
+value = '0'
+with open("output.json", "r") as file:
+  data = json.load(file)
+  total = data.get('benchmarks')[0].get('stats').get('total')
+  value = '{:.2f}'.format(total)
+
+svg = badge(left_text='Benckmark (SSL 1.0)', right_text=value)
+f = open('benchmark.svg', 'w')
+f.write(svg)
+f.close()
\ No newline at end of file
diff --git a/.github/workflows/bechmark.yml b/.github/workflows/bechmark.yml
index c1fecdb24dc..220bfd3fe76 100644
--- a/.github/workflows/bechmark.yml
+++ b/.github/workflows/bechmark.yml
@@ -1,7 +1,7 @@
 name: Benchmark
 
 on:
-  push: 
+  push:
     branches:
       - develop
       - master
@@ -25,10 +25,10 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: "3.7"
 
-      - name: Setup pytest-benchmark
-        run: pip install pytest pytest-benchmark
+      - name: Setup Python libs
+        run: pip install pytest pytest-benchmark && pip install pybadges
 
       - name: Download SSL 3.1
         run: git clone https://github.com/1c-syntax/ssl_3_1.git ssl
@@ -36,29 +36,33 @@ jobs:
       - name: Analyze ssl
         run: pytest .github/scripts/bechmark.py --benchmark-min-rounds=1 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
 
+      - name: Generation badge benchmark
+        if: github.event_name == 'push'
+        run: python .github/scripts/gen-bandge.py
+
       - name: Check benchmark result for pull request
         if: github.event_name == 'pull_request'
-        uses: otymko/github-action-benchmark@v1
+        uses: otymko/github-action-benchmark@v1.1
         with:
           name: BSL LS perfomance measurement (SSL 3.1)
-          tool: 'pytest'
+          tool: "pytest"
           output-file-path: output.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          alert-threshold: '10%'
+          alert-threshold: "110%"
           comment-on-alert: true
-          fail-on-alert: true
-          alert-comment-cc-users: '@otymko'
+          fail-on-alert: false
+          alert-comment-cc-users: "@otymko"
 
       - name: Store benchmark result into branch
         if: github.event_name == 'push'
-        uses: otymko/github-action-benchmark@v1
+        uses: otymko/github-action-benchmark@v1.1
         with:
           name: BSL LS perfomance measurement (SSL 3.1)
-          tool: 'pytest'
+          tool: "pytest"
           output-file-path: output.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
           auto-push: true
-          alert-threshold: '10%'
+          alert-threshold: "110%"
           comment-on-alert: true
-          fail-on-alert: true
-          alert-comment-cc-users: '@otymko'
+          fail-on-alert: false
+          alert-comment-cc-users: "@otymko"

From 5ebcc70f0b078b6efe7a88db5a01a63d5b736bef Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 02:18:59 +0700
Subject: [PATCH 017/444] =?UTF-8?q?=D0=B1=D0=B5=D0=B9=D0=B4=D0=B6=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=80=D0=BE=D0=B2=20=D0=B2=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/index.md | 1 +
 docs/index.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/en/index.md b/docs/en/index.md
index 823698fdf6d..e1bdd5980f4 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -8,6 +8,7 @@
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
+[![Benchmark](bench/benchmark.svg)](bench/index.html)
 [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
 
 [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) implementation for 1C (BSL) - 1C:Enterprise 8 and [OneScript](http://oscript.io) languages.
diff --git a/docs/index.md b/docs/index.md
index e0b3101bb1e..2346487ee19 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -8,6 +8,7 @@
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
+[![Benchmark](bench/benchmark.svg)](bench/index.html)
 [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
 
 Реализация протокола [language server protocol](https://microsoft.github.io/language-server-protocol/) для языка 1C (BSL) - языка 1С:Предприятие 8 и [OneScript](http://oscript.io).

From 06b641dfdde85e9b7c42f9c6ae62373c0f10bcd2 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 02:22:38 +0700
Subject: [PATCH 018/444] =?UTF-8?q?=D0=91=D0=B5=D0=B9=D0=B4=D0=B6=20=D0=B2?=
 =?UTF-8?q?=20=D1=80=D0=B8=D0=B4=D0=BC=D0=B8,=20=D0=BF=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B4=D0=B2=D1=83=D1=85=20=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BA=20(=D0=BC=D0=B0=D1=81=D1=82=D0=B5=D1=80=20/=20?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=B2=D0=B5=D0=BB=D0=BE=D0=BF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 08a460d11bb..f63eb6fdc0c 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
+[![Benchmark](https://1c-syntax.github.io/bsl-language-server/dev/bench/benchmark.svg)](https://1c-syntax.github.io/bsl-language-server/dev/bench/index.html)
 [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
 
 Реализация протокола [language server protocol](https://microsoft.github.io/language-server-protocol/) для языка 1C (BSL) - языка 1С:Предприятие 8 и [OneScript](http://oscript.io).

From c7fdd290b1271788cd09559efb3553c655d0cb01 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 20:48:15 +0700
Subject: [PATCH 019/444] =?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=BD=D1=8B=D0=B5=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=80=D0=BE=D0=B2=20(=D0=B1?=
 =?UTF-8?q?=D1=8B=D0=BB=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/{bechmark.py => benchmark.py}     | 0
 .github/workflows/{bechmark.yml => benchmark.yml} | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/scripts/{bechmark.py => benchmark.py} (100%)
 rename .github/workflows/{bechmark.yml => benchmark.yml} (92%)

diff --git a/.github/scripts/bechmark.py b/.github/scripts/benchmark.py
similarity index 100%
rename from .github/scripts/bechmark.py
rename to .github/scripts/benchmark.py
diff --git a/.github/workflows/bechmark.yml b/.github/workflows/benchmark.yml
similarity index 92%
rename from .github/workflows/bechmark.yml
rename to .github/workflows/benchmark.yml
index 220bfd3fe76..fced97e3f2b 100644
--- a/.github/workflows/bechmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -34,7 +34,7 @@ jobs:
         run: git clone https://github.com/1c-syntax/ssl_3_1.git ssl
 
       - name: Analyze ssl
-        run: pytest .github/scripts/bechmark.py --benchmark-min-rounds=1 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
+        run: pytest .github/scripts/benchmark.py --benchmark-min-rounds=1 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
 
       - name: Generation badge benchmark
         if: github.event_name == 'push'

From 7a0d3a7c161f2b3a1946b28e323e1968b3098cf0 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 20:49:58 +0700
Subject: [PATCH 020/444] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20ben?=
 =?UTF-8?q?ch=20=D0=BF=D1=80=D0=B8=20build=20gh-pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/gh-pages.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index ac5a64cfbf9..84fb4cebea5 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -32,6 +32,7 @@ jobs:
       run: |
         wget https://github.com/${{ github.repository }}/archive/gh-pages.zip || true
         unzip gh-pages.zip || true
+        mkdir tmp-bench
     
     - name: Save latest Develop
       if: github.ref == 'refs/heads/master'
@@ -47,6 +48,16 @@ jobs:
         cp -R ${GITHUB_REPOSITORY#*/}-gh-pages/. public || true
         rm -rf public/dev || true
         mkdir public/dev
+
+    - name: Backup benchmark (master)
+      if: github.ref == 'refs/heads/master'
+      run: |
+        cp -R ${GITHUB_REPOSITORY#*/}-gh-pages/bench/. tmp-bench || true
+
+    - name: Backup benchmark (develop)
+      if: github.ref == 'refs/heads/develop'
+      run: |
+        cp -R ${GITHUB_REPOSITORY#*/}-gh-pages/dev/bench/. tmp-bench || true
             
     - name: Patch Develop
       if: github.ref == 'refs/heads/develop'
@@ -66,7 +77,12 @@ jobs:
         rm -rf temp/docs/en
         cd temp
         mkdocs build
-    
+
+    - name: Copy benchmark
+      run: |
+        cp -R tmp-bench/. temp/site/bench
+        rm -rf tmp-bench
+ 
     - name: Public Russian Master
       if: github.ref == 'refs/heads/master'
       run: |

From 08fee804b9438c071389af626ef37de4c50c585d Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 20:50:11 +0700
Subject: [PATCH 021/444] =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D1=8B=20gh-pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/index.md b/docs/index.md
index 2346487ee19..224a4ceb131 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -125,3 +125,4 @@ java -jar bsl-language-server.jar --format --srcDir ./src/cf
 Создатель профессиональных инструментов разработки программного обеспечения, инновационных и мощных, [JetBrains](https://www.jetbrains.com) поддержал наш проект, предоставив лицензии на свои продукты, в том числе на `IntelliJ IDEA Ultimate`.
 
 `IntelliJ IDEA Ultimate` один из лучших инструментов в своем классе.
+

From 45da7fdddc134244cd313ae6d937249a56b8a3d0 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 21:21:31 +0700
Subject: [PATCH 022/444] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D1=80=D1=83=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?=20bench=20=D1=81=201=20=D0=B4=D0=BE=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index fced97e3f2b..5002e68c47e 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -34,7 +34,7 @@ jobs:
         run: git clone https://github.com/1c-syntax/ssl_3_1.git ssl
 
       - name: Analyze ssl
-        run: pytest .github/scripts/benchmark.py --benchmark-min-rounds=1 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
+        run: pytest .github/scripts/benchmark.py --benchmark-min-rounds=3 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
 
       - name: Generation badge benchmark
         if: github.event_name == 'push'

From a96ffc5e9403a211648c232117bcd906a72bfba9 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Sat, 11 Apr 2020 21:56:46 +0700
Subject: [PATCH 023/444] =?UTF-8?q?Total=20=D0=BD=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=B8=D1=85=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D1=80=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

total -> mean
---
 .github/scripts/gen-bandge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/gen-bandge.py b/.github/scripts/gen-bandge.py
index 2195d8385f3..298d9e4f75e 100644
--- a/.github/scripts/gen-bandge.py
+++ b/.github/scripts/gen-bandge.py
@@ -4,10 +4,10 @@
 value = '0'
 with open("output.json", "r") as file:
   data = json.load(file)
-  total = data.get('benchmarks')[0].get('stats').get('total')
+  total = data.get('benchmarks')[0].get('stats').get('mean')
   value = '{:.2f}'.format(total)
 
 svg = badge(left_text='Benckmark (SSL 1.0)', right_text=value)
 f = open('benchmark.svg', 'w')
 f.write(svg)
-f.close()
\ No newline at end of file
+f.close()

From 75a4e55e7bb86459f34821b53afb6ec1d7197ef3 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Sat, 11 Apr 2020 14:32:11 +0300
Subject: [PATCH 024/444] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B5=D0=B5=20=D0=B8=D0=BC=D1=8F=20=D0=BC=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D0=B2=20=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=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/DiagnostcAddSettings.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/DiagnostcAddSettings.md b/docs/contributing/DiagnostcAddSettings.md
index 1c70b2abfc2..c17b3e255c4 100644
--- a/docs/contributing/DiagnostcAddSettings.md
+++ b/docs/contributing/DiagnostcAddSettings.md
@@ -43,12 +43,12 @@
 
 Обязательно нужно добавить тест для случая изменения настроек диагностики.  
 Тест добавляется во все тот же класс теста диагностики _(отдельный метод для каждой комбинации вариантов настроек диагностики)_. В начале теста необходимо выполнить установку значения параметра диагностики, последующие действия аналогичны общим правилам написания тестов.  
-Для установки параметра диагностики из теста необходимо получить конфигурацию диагностики по-умолчанию, используя метод `getDefaultDiagnosticConfiguration()` из метаданных текущей диагностики `diagnosticInstance.getInfo()`. Затем выполнить изменение значения параметра, путем добавления в коллекцию конфигурации, а затем переконфигурировать текущую диагностику, обратившись к методу `configure`.  
+Для установки параметра диагностики из теста необходимо получить конфигурацию диагностики по-умолчанию, используя метод `getDefaultConfiguration()` из метаданных текущей диагностики `diagnosticInstance.getInfo()`. Затем выполнить изменение значения параметра, путем добавления в коллекцию конфигурации, а затем переконфигурировать текущую диагностику, обратившись к методу `configure`.  
 Пример
 
 ```java
 // получение текущей конфигурации диагностики
-Map<String, Object> configuration = diagnosticInstance.getInfo().getDefaultDiagnosticConfiguration();
+Map<String, Object> configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
 
 // установка нового значения
 configuration.put("commentsAnnotation", "//(с)");

From a48f479c851e9aa34d7bc250b8e5759d8cc3cc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Sun, 12 Apr 2020 13:24:15 +0300
Subject: [PATCH 025/444] =?UTF-8?q?Typo:=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=20=D0=B2=20=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20ERP?=
 =?UTF-8?q?=20=D0=B8=20word?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/diagnostics/TypoDiagnostic_ru.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index 20d23154b99..cc04cc27c96 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -5,6 +5,10 @@ diagnosticExceptions=Модифицированность,Повт,Исп,Рег
   Таб,Док,Стр,гггг,дд,Перезаполнить,Версионирование,Автогруппировку,Подредакции,Версионируемого,Сис,Автозаголовок,Неиспользующихся,\
   Дозаполнить,Гиперссылкой,Слеш,Гиперссылку,Слеши,Слеша,Гиперссылкой,Перепроведение,Перепроведения,Перепроведением,Автонастройка\
   ,Многострочность,Перезаполняется,Неопределен,Модифицированности,Подредакции,Фич,Гиперссылок,Автонастройку,Непройденные,Псевдо,Подпапки\
-  ,Декомпозировать,Автообновление,Хэш,Гант,Ганта,Версионируемый,Автоиспользование,Непроведенный,Гипер
+  ,Декомпозировать,Автообновление,Хэш,Гант,Ганта,Версионируемый,Автоиспользование,Непроведенный,Гипер\
+  ,Регл,Госрегулированием,Мульти,Неодобренном,Валидное,Штрихкодам,Коннект,Сконвертировать,Офшоре,Корсчета\
+  ,Микропредприятий,Зарплатных,Зацикленности,Журналирования,Сворачиваемости,Студотряде,Перезаполняемая,Резидентство\
+  ,Отсканированной,Парсер,Валидные,Несырьевых,Штрихкодом,Подзапросы,Физлица,Штрихкоду,Стикера,Техподдержки,Грейд\
+  ,Процессинговых,Однострочное,Офшоров,Токене
 minWordLength=Минимальная длина проверяемых слов
 userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file

From 3098751518aaf09e129f0e882f055a4236d13836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Sun, 12 Apr 2020 13:29:56 +0300
Subject: [PATCH 026/444] =?UTF-8?q?Typo:=20=D0=A1=D0=BE=D1=80=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D0=BB=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B2=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/TypoDiagnostic_ru.properties   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index cc04cc27c96..f509b23d925 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -1,14 +1,14 @@
 diagnosticMessage=Возможная опечатка в "%s"
 diagnosticName=Опечатка
 diagnosticLanguage=ru
-diagnosticExceptions=Модифицированность,Повт,Исп,Рег,Знч,Возр,Убыв,Неопределено,Субконто,Дт,Кт,Автотест,Сериализатор,\
-  Таб,Док,Стр,гггг,дд,Перезаполнить,Версионирование,Автогруппировку,Подредакции,Версионируемого,Сис,Автозаголовок,Неиспользующихся,\
-  Дозаполнить,Гиперссылкой,Слеш,Гиперссылку,Слеши,Слеша,Гиперссылкой,Перепроведение,Перепроведения,Перепроведением,Автонастройка\
-  ,Многострочность,Перезаполняется,Неопределен,Модифицированности,Подредакции,Фич,Гиперссылок,Автонастройку,Непройденные,Псевдо,Подпапки\
-  ,Декомпозировать,Автообновление,Хэш,Гант,Ганта,Версионируемый,Автоиспользование,Непроведенный,Гипер\
-  ,Регл,Госрегулированием,Мульти,Неодобренном,Валидное,Штрихкодам,Коннект,Сконвертировать,Офшоре,Корсчета\
-  ,Микропредприятий,Зарплатных,Зацикленности,Журналирования,Сворачиваемости,Студотряде,Перезаполняемая,Резидентство\
-  ,Отсканированной,Парсер,Валидные,Несырьевых,Штрихкодом,Подзапросы,Физлица,Штрихкоду,Стикера,Техподдержки,Грейд\
-  ,Процессинговых,Однострочное,Офшоров,Токене
+diagnosticExceptions=Автогруппировку,Автозаголовок,Автоиспользование,Автонастройка,Автонастройку,Автообновление,Автотест\
+  ,Валидное,Валидные,Версионирование,Версионируемого,Версионируемый,Возр,Гант,Ганта,гггг,Гипер,Гиперссылкой,Гиперссылкой\
+  ,Гиперссылку,Гиперссылок,Госрегулированием,Грейд,дд,Декомпозировать,Дозаполнить,Док,Дт,Журналирования,Зарплатных\
+  ,Зацикленности,Знч,Исп,Коннект,Корсчета,Кт,Микропредприятий,Многострочность,Модифицированности,Модифицированность\
+  ,Мульти,Неиспользующихся,Неодобренном,Неопределен,Неопределено,Непроведенный,Непройденные,Несырьевых,Однострочное\
+  ,Отсканированной,Офшоре,Офшоров,Парсер,Перезаполнить,Перезаполняемая,Перезаполняется,Перепроведение,Перепроведением\
+  ,Перепроведения,Повт,Подзапросы,Подпапки,Подредакции,Подредакции,Процессинговых,Псевдо,Рег,Регл,Резидентство\
+  ,Сворачиваемости,Сериализатор,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
+  ,Токене,Убыв,Физлица,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду
 minWordLength=Минимальная длина проверяемых слов
 userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file

From 7e8d7917623b9872beda4beb3796446f0e022f41 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Sun, 12 Apr 2020 07:06:54 +0300
Subject: [PATCH 027/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BE=D0=B1=20=D1=81=D0=B8=D1=82=D1=83?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20co?=
 =?UTF-8?q?nfigure=20=D0=BD=D0=B0=D0=B4=D0=BE=20=D1=80=D0=B5=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/DiagnostcAddSettings.md | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/contributing/DiagnostcAddSettings.md b/docs/contributing/DiagnostcAddSettings.md
index c17b3e255c4..7f82133e1ae 100644
--- a/docs/contributing/DiagnostcAddSettings.md
+++ b/docs/contributing/DiagnostcAddSettings.md
@@ -24,17 +24,31 @@
 
 ```
 
-Следующим шагом, необходимо реализовать метод установки значения `configure`.  
-Например
+Если параметр примитивный или типа String и он устанавливается в соответствующее свойство класса диагностики простым сеттером, то на этом все.  
+Если же параметр более сложный, например строка-паттерн для регулярного выражения, которое необходимо вычислить перед установкой, то нужно реализовать метод установки значений параметров `configure`.  
+
+Например есть два параметра:
+
+- `commentAsCode` - считать комментарии как код, типа булево
+- `excludeMethods` - методы, которые не надо проверять, типа ArrayList
+
+Тогда метод установки значений параметров будет выглядеть:
 
 ```java
  @Override
   public void configure(Map<String, Object> configuration) {
+    
     if (configuration == null) {
       return;
     }
-
-    this.commentsAnnotation = (String) configuration.getOrDefault("commentsAnnotation", commentsAnnotation);
+    
+    // для установки "простых свойств", включая "commentAsCode"
+    super.configure(configuration);
+
+    // установка "сложного" свойства "excludeMethods"
+    String excludeMethodsString =
+      (String) configuration.getOrDefault("excludeMethods", EXCLUDE_METHODS_DEFAULT);
+    this.excludeMethods = new ArrayList<>(Arrays.asList(excludeMethodsString.split(",")));
   }
 
 ```

From 7ca97f2285803c9c9fcaf86f11490d440c0fe1e1 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Sun, 12 Apr 2020 08:45:58 +0300
Subject: [PATCH 028/444] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/Rules.md | 43 ++++++++++++++++++++++++++++++++++++++
 docs/contributing/index.md |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 docs/contributing/Rules.md

diff --git a/docs/contributing/Rules.md b/docs/contributing/Rules.md
new file mode 100644
index 00000000000..835abc2b414
--- /dev/null
+++ b/docs/contributing/Rules.md
@@ -0,0 +1,43 @@
+# Правила или как жить дружно и эффективно
+
+Проект `BSL Language Server` является свободным, некоммерческим, развивается дружным сообществом, где главенствующими правилами являются взаимоуважение и взаимопомощь.
+
+В других документах, можно найти правила и инструкции разработки, здесь же больше социальные правила.
+
+Рассмотрим на примере, что хорошо, и что плохо.
+
+## Изучение
+
+Вы увидели наш проект и у вас появились вопросы. Задавать вопросы можно в любом официальном канале, будь то чат или обсуждение в рамках задачи на GitHub. __Но!__
+
+Вопросы и замечания типа "что это за фигня", "на****я", "нормальные люди так не делают", "кгам" - оставьте при себе, кому-то все равно, но некоторым может быть обидно, неприятно.  
+
+Переформулируйте вопросы на "а что это вы тут делаете", "а почему, какая цель", "как это работает" и вы получите адекватный, развернутый ответ. За замечания "так не правильно, __ПОТОМУ ЧТО__ *далее ссылки или пояснения*" будут отдельные благодарность и уважение, так как идеальных людей нет и все совершают ошибки, а соринка в чужом глазу всегда виднее.
+
+## Разработка
+
+Вы решили помочь проекту, внеся доработки в его кодовую базу, документацию. Сразу спасибо :). __Но!__  
+Надо быть готовым к тому, что изменения обязательно будут анализироваться, к ним могут быть высказаны замечания, в том числе: "все неправильно, потому что..." и "нужно переделать...".  
+
+Необходимо адекватно воспринимать замечания, внося соответствующие исправления. Если считаете, что ваше решение верно, то дискуссия с примерами и пояснениями приветствуется, как говорил уже ранее, идеальных людей нет.
+
+Если у вас что-то не получается, не понимаете как сделать - спрашивайте, но опять же, без "наездов" типа "у вас черт ногу сломит, фиг поймешь как эта х***ня работает".
+
+Помощь вам в "сделать хорошо" несет пользу проекту, но не стоит злоупотребять вопросами "как это делается", ожидать готовое решение - если вы не можете разобраться в языке программирования, на котором пишете, стоит отложить задачу и поизучать, здесь не бесплатные курсы для студентов.
+
+## Найдена ошибка, несоответствие, опечатка и т.д.
+
+Если вы нашли у нас ошибку - сообщите о ней. Хороший вариант - это оформить задачу в проекте на GitHub, идеальный - отправить следом PULL REQUEST с исправлением.  
+__УЖАСНЫЙ ВАРИАНТ__ - это просто кричать "у вас кругом одни баги", "все сыро и противно" и т.д. Кому вы помогли данным сообщением? Попытка понизить самооценку сообщества и мейнтенеров или самоутверждение за счет других?
+
+## Общение
+
+Оскорбления не приемлемы в любом виде!
+
+## Вам не нравится проект, люди, правила
+
+Если вам не нравится конкретный человек сообщества по личным причинам - это ваши личные проблемы, помочь мы вам не сможем, разбирайтесь сами.  
+
+Если вам не нравятся правила, можно обсудить, но... **наш проект, наши правила**.
+
+Если вам не нравится наш проект - ничего страшного, просто пройдите мимо.
diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index f1ae581b385..00c7da45cac 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -2,6 +2,8 @@
 
 В данном разделе собраны статьи, содержащие информацию для разработчиков диагностик и функциональности ядра.
 
+[Необходимо прочитать в самом начале](Rules.md).
+
 ## Инструкции
 
 - Старт

From ebf4a3cd44b5e2cfbe8c6eb9c35766d03928db03 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Sun, 12 Apr 2020 14:09:49 +0300
Subject: [PATCH 029/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/Rules.md => CODE_OF_CONDUCT.md | 2 +-
 docs/contributing/index.md                       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename docs/contributing/Rules.md => CODE_OF_CONDUCT.md (97%)

diff --git a/docs/contributing/Rules.md b/CODE_OF_CONDUCT.md
similarity index 97%
rename from docs/contributing/Rules.md
rename to CODE_OF_CONDUCT.md
index 835abc2b414..1f0b73cdd8f 100644
--- a/docs/contributing/Rules.md
+++ b/CODE_OF_CONDUCT.md
@@ -28,7 +28,7 @@
 ## Найдена ошибка, несоответствие, опечатка и т.д.
 
 Если вы нашли у нас ошибку - сообщите о ней. Хороший вариант - это оформить задачу в проекте на GitHub, идеальный - отправить следом PULL REQUEST с исправлением.  
-__УЖАСНЫЙ ВАРИАНТ__ - это просто кричать "у вас кругом одни баги", "все сыро и противно" и т.д. Кому вы помогли данным сообщением? Попытка понизить самооценку сообщества и мейнтенеров или самоутверждение за счет других?
+__УЖАСНЫЙ ВАРИАНТ__ - это просто кричать "у вас кругом одни баги", "все сыро и противно" и т.д. Кому вы помогли данным сообщением? Попытка понизить самооценку сообщества и мейнтейнеров или самоутверждение за счет других?
 
 ## Общение
 
diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index 00c7da45cac..f1ae581b385 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -2,8 +2,6 @@
 
 В данном разделе собраны статьи, содержащие информацию для разработчиков диагностик и функциональности ядра.
 
-[Необходимо прочитать в самом начале](Rules.md).
-
 ## Инструкции
 
 - Старт

From bbded4354da0b0e80b0545b11225141dff0c383c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Sun, 12 Apr 2020 14:12:46 +0300
Subject: [PATCH 030/444] =?UTF-8?q?Typo:=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=20=D0=B2=20=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=91=D0=A1=D0=9F=20=D0=B8=20word?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/diagnostics/TypoDiagnostic_ru.properties  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index f509b23d925..ffebbb37879 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -9,6 +9,9 @@ diagnosticExceptions=Автогруппировку,Автозаголовок,
   ,Отсканированной,Офшоре,Офшоров,Парсер,Перезаполнить,Перезаполняемая,Перезаполняется,Перепроведение,Перепроведением\
   ,Перепроведения,Повт,Подзапросы,Подпапки,Подредакции,Подредакции,Процессинговых,Псевдо,Рег,Регл,Резидентство\
   ,Сворачиваемости,Сериализатор,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
-  ,Токене,Убыв,Физлица,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду
+  ,Токене,Убыв,Физлица,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду,Версионирования,Подредакция,Отсканированные\
+  ,Финализировать,Стартован,Разыменователь,Сериализованный,Автоподбор,Подпапка,Видеозвонки,Десериализовать,Неполностью\
+  ,Автогенерируемых,Несинхронизируемые,Тэгов,Тэги,Версионируемые,Неинтерактивном,Авторегистрация,Сериализованные\
+  ,Транслите,Бухфон,Денормализовать,Перезаполнения,Подотчетнику,Непроведенных
 minWordLength=Минимальная длина проверяемых слов
 userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file

From 68962726a3803c3a831cc69f4b2385b77578ab7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Sun, 12 Apr 2020 14:16:11 +0300
Subject: [PATCH 031/444] =?UTF-8?q?=20Typo:=20=D0=A1=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B2=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/TypoDiagnostic_ru.properties  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index ffebbb37879..436fdec1ee9 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -1,17 +1,17 @@
 diagnosticMessage=Возможная опечатка в "%s"
 diagnosticName=Опечатка
 diagnosticLanguage=ru
-diagnosticExceptions=Автогруппировку,Автозаголовок,Автоиспользование,Автонастройка,Автонастройку,Автообновление,Автотест\
-  ,Валидное,Валидные,Версионирование,Версионируемого,Версионируемый,Возр,Гант,Ганта,гггг,Гипер,Гиперссылкой,Гиперссылкой\
-  ,Гиперссылку,Гиперссылок,Госрегулированием,Грейд,дд,Декомпозировать,Дозаполнить,Док,Дт,Журналирования,Зарплатных\
-  ,Зацикленности,Знч,Исп,Коннект,Корсчета,Кт,Микропредприятий,Многострочность,Модифицированности,Модифицированность\
-  ,Мульти,Неиспользующихся,Неодобренном,Неопределен,Неопределено,Непроведенный,Непройденные,Несырьевых,Однострочное\
-  ,Отсканированной,Офшоре,Офшоров,Парсер,Перезаполнить,Перезаполняемая,Перезаполняется,Перепроведение,Перепроведением\
-  ,Перепроведения,Повт,Подзапросы,Подпапки,Подредакции,Подредакции,Процессинговых,Псевдо,Рег,Регл,Резидентство\
-  ,Сворачиваемости,Сериализатор,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
-  ,Токене,Убыв,Физлица,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду,Версионирования,Подредакция,Отсканированные\
-  ,Финализировать,Стартован,Разыменователь,Сериализованный,Автоподбор,Подпапка,Видеозвонки,Десериализовать,Неполностью\
-  ,Автогенерируемых,Несинхронизируемые,Тэгов,Тэги,Версионируемые,Неинтерактивном,Авторегистрация,Сериализованные\
-  ,Транслите,Бухфон,Денормализовать,Перезаполнения,Подотчетнику,Непроведенных
+diagnosticExceptions=Автогенерируемых,Автогруппировку,Автозаголовок,Автоиспользование,Автонастройка,Автонастройку\
+  ,Автообновление,Автоподбор,Авторегистрация,Автотест,Бухфон,Валидное,Валидные,Версионирование,Версионирования\
+  ,Версионируемого,Версионируемые,Версионируемый,Видеозвонки,Возр,Гант,Ганта,гггг,Гипер,Гиперссылкой,Гиперссылкой\
+  ,Гиперссылку,Гиперссылок,Госрегулированием,Грейд,дд,Декомпозировать,Денормализовать,Десериализовать,Дозаполнить,Док\
+  ,Дт,Журналирования,Зарплатных,Зацикленности,Знч,Исп,Коннект,Корсчета,Кт,Микропредприятий,Многострочность\
+  ,Модифицированности,Модифицированность,Мульти,Неинтерактивном,Неиспользующихся,Неодобренном,Неопределен,Неопределено\
+  ,Неполностью,Непроведенный,Непроведенных,Непройденные,Несинхронизируемые,Несырьевых,Однострочное,Отсканированной\
+  ,Отсканированные,Офшоре,Офшоров,Парсер,Перезаполнения,Перезаполнить,Перезаполняемая,Перезаполняется,Перепроведение\
+  ,Перепроведением,Перепроведения,Повт,Подзапросы,Подотчетнику,Подпапка,Подпапки,Подредакции,Подредакция\
+  ,Процессинговых,Псевдо,Разыменователь,Рег,Регл,Резидентство,Сворачиваемости,Сериализатор,Сериализованные\
+  ,Сериализованный,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стартован,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
+  ,Токене,Транслите,Тэги,Тэгов,Убыв,Физлица,Финализировать,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду
 minWordLength=Минимальная длина проверяемых слов
 userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file

From 1b098633a22d772b5446ac16cfd2213ec1b69d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <Stepa86@gmail.com>
Date: Sun, 12 Apr 2020 14:33:38 +0300
Subject: [PATCH 032/444] =?UTF-8?q?=20Typo:=20fix=20#1024=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8B=D0=BB=D1=8C=20=D0=BD=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20=D1=84=D0=BE=D1=80=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index 436fdec1ee9..8643041577d 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -12,6 +12,6 @@ diagnosticExceptions=Автогенерируемых,Автогруппиров
   ,Перепроведением,Перепроведения,Повт,Подзапросы,Подотчетнику,Подпапка,Подпапки,Подредакции,Подредакция\
   ,Процессинговых,Псевдо,Разыменователь,Рег,Регл,Резидентство,Сворачиваемости,Сериализатор,Сериализованные\
   ,Сериализованный,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стартован,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
-  ,Токене,Транслите,Тэги,Тэгов,Убыв,Физлица,Финализировать,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду
+  ,Токене,Транслите,Тэги,Тэгов,Убыв,Физлица,Финализировать,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду,Мдд,Чммсс
 minWordLength=Минимальная длина проверяемых слов
 userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file

From 3ee3d29bde7b7af69fbd88998703b46f6e7063cc Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Sun, 12 Apr 2020 18:41:07 +0300
Subject: [PATCH 033/444] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20=D0=B4=D1=83=D0=B1?=
 =?UTF-8?q?=D0=BB=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UsingServiceTagDiagnostic.java               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
index de655733b6d..ce939ebe99e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
@@ -84,10 +84,11 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
 
     documentContext.getComments()
       .parallelStream()
-      .filter((Token token) -> pattern.matcher(token.getText()).find())
       .forEach((Token token) -> {
         Matcher matcher = pattern.matcher(token.getText());
-        matcher.find();
+        if (!matcher.find()){
+          return;
+        }
         diagnosticStorage.addDiagnostic(
           token,
           info.getMessage(matcher.group(0))

From 41ab8db11faab8c8abfa6fbbae3141fe7c35098b Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 10 Apr 2020 13:13:52 +0300
Subject: [PATCH 034/444] Fix qf

---
 .../codeactions/FixAllCodeActionSupplier.java          |  1 -
 .../codeactions/QuickFixCodeActionSupplier.java        |  1 -
 .../languageserver/codeactions/QuickFixSupplier.java   |  2 +-
 .../bsl/languageserver/context/ServerContext.java      |  2 +-
 .../languageserver/context/symbol/RegionSymbol.java    |  2 +-
 .../diagnostics/CodeBlockBeforeSubDiagnostic.java      |  2 +-
 .../diagnostics/CodeOutOfRegionDiagnostic.java         |  2 +-
 .../diagnostics/DeprecatedCurrentDateDiagnostic.java   |  8 --------
 .../DeprecatedTypeManagedFormDiagnostic.java           |  2 +-
 .../NestedFunctionInParametersDiagnostic.java          |  2 +-
 .../NonExportMethodsInApiRegionDiagnostic.java         | 10 +++++-----
 .../PublicMethodsDescriptionDiagnostic.java            |  8 ++++----
 .../_1c_syntax/bsl/languageserver/utils/Trees.java     |  2 +-
 .../bsl/languageserver/context/ServerContextTest.java  |  2 +-
 14 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/FixAllCodeActionSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/FixAllCodeActionSupplier.java
index fd9ce04373e..0394301a8db 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/FixAllCodeActionSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/FixAllCodeActionSupplier.java
@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.QuickFixProvider;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
 import com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixCodeActionSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixCodeActionSupplier.java
index 6957d90a416..7e7d4b66cef 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixCodeActionSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixCodeActionSupplier.java
@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.QuickFixProvider;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
 import com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java
index ca5965a901c..70baa1ee611 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java
@@ -51,7 +51,7 @@ public List<Class<? extends QuickFixProvider>> getQuickFixClasses() {
   }
 
   @SuppressWarnings("unchecked")
-  public  <T extends Either<String, Number>> Optional<Class<? extends QuickFixProvider>> getQuickFixClass(
+  public <T extends Either<String, Number>> Optional<Class<? extends QuickFixProvider>> getQuickFixClass(
     T diagnosticCode
   ) {
     Optional<Class<? extends BSLDiagnostic>> diagnosticClass = diagnosticSupplier.getDiagnosticClass(diagnosticCode);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index a57bf406820..d4b62c01410 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -21,9 +21,9 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context;
 
+import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.utils.Lazy;
-import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import org.eclipse.lsp4j.TextDocumentItem;
 
 import javax.annotation.CheckForNull;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
index 08fadc6d084..0b0ac4847ac 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
@@ -60,7 +60,7 @@ public class RegionSymbol implements Symbol {
   @NonFinal
   @Builder.Default
   // TODO подумать, как избавиться от этого
-  List<BSLParserRuleContext> nodes = new ArrayList<>();
+    List<BSLParserRuleContext> nodes = new ArrayList<>();
 
   @Override
   public void clearParseTreeData() {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeBlockBeforeSubDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeBlockBeforeSubDiagnostic.java
index b40db6ce401..3bd7d47f249 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeBlockBeforeSubDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeBlockBeforeSubDiagnostic.java
@@ -45,7 +45,7 @@ public CodeBlockBeforeSubDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFileCodeBlockBeforeSub(BSLParser.FileCodeBlockBeforeSubContext ctx) {
     // todo надо править парсер ибо данный узел есть даже когда его нет. ниже попытка обойти это
-    if(!ctx.getTokens().isEmpty()) {
+    if (!ctx.getTokens().isEmpty()) {
       diagnosticStorage.addDiagnostic(ctx);
     }
     return ctx;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
index b9d5078a4c4..f4446e229f1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
@@ -71,7 +71,7 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
     if (regions.isEmpty() && !ctx.getTokens().isEmpty()) {
 
       List<DiagnosticRelatedInformation> relatedInformation = createRelatedInformations(ctx);
-      if(!relatedInformation.isEmpty()) {
+      if (!relatedInformation.isEmpty()) {
         diagnosticStorage.addDiagnostic(
           relatedInformation.get(0).getLocation().getRange(),
           relatedInformation);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
index 1695355841f..35224ae62e1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
@@ -21,22 +21,14 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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.DiagnosticScope;
 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.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.parser.BSLParser;
-import org.eclipse.lsp4j.CodeAction;
-import org.eclipse.lsp4j.CodeActionParams;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.TextEdit;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
index 49f763e0697..e7c99c9f14a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
@@ -70,7 +70,7 @@ public DeprecatedTypeManagedFormDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx ) {
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     Optional.of(ctx)
       .filter(it -> methodPattern.matcher(it.methodName().getText()).matches())
       .map(BSLParser.GlobalMethodCallContext::doCall)
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedFunctionInParametersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedFunctionInParametersDiagnostic.java
index 254f980673d..abfacd3a5e1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedFunctionInParametersDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedFunctionInParametersDiagnostic.java
@@ -62,7 +62,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
   public ParseTree visitNewExpression(BSLParser.NewExpressionContext ctx) {
 
     if (findNestedCall(ctx, ctx.doCall())) {
-      if(ctx.typeName() != null) {
+      if (ctx.typeName() != null) {
         diagnosticStorage.addDiagnostic(
           ctx.typeName(),
           info.getMessage(
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
index 44e3d342156..0e7e897d1c8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
@@ -61,11 +61,11 @@ public ParseTree visitSub(BSLParser.SubContext ctx) {
       }
 
       methodSymbol.getRootParent().ifPresent((Symbol rootRegion) -> {
-          if (REGION_NAME.matcher(rootRegion.getName()).matches()) {
-            String message = info.getMessage(methodSymbol.getName(), rootRegion.getName());
-            diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange(), message);
-          }
-        });
+        if (REGION_NAME.matcher(rootRegion.getName()).matches()) {
+          String message = info.getMessage(methodSymbol.getName(), rootRegion.getName());
+          diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange(), message);
+        }
+      });
     });
 
     return ctx;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
index 6f284f0b808..ebdaa24274e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
@@ -73,10 +73,10 @@ public ParseTree visitSub(BSLParser.SubContext ctx) {
           diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange());
         } else {
           methodSymbol.getRootParent().ifPresent((Symbol rootRegion) -> {
-              if (isAPIRegion(rootRegion)) {
-                diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange());
-              }
-            });
+            if (isAPIRegion(rootRegion)) {
+              diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange());
+            }
+          });
         }
       }
     });
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
index aabb6ee8325..2ce462cf19e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
@@ -291,7 +291,7 @@ public static boolean nodeContains(ParseTree t, ParseTree exclude, Integer... in
 
   /**
    * @param tokens - список токенов из DocumentContext
-   * @param token - токен, на строке которого требуется найти висячий комментарий
+   * @param token  - токен, на строке которого требуется найти висячий комментарий
    * @return - токен с комментарием, если он найден
    */
   public static Optional<Token> getTrailingComment(List<Token> tokens, Token token) {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
index 19688e14cd6..515eb9aa948 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
@@ -21,11 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context;
 
-import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import com.github._1c_syntax.mdclasses.metadata.additional.ConfigurationSource;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
+import com.github._1c_syntax.utils.Absolute;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;

From 34f7eba47d4d46ef96c41751cebaacac30c9e868 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 11:06:30 +0300
Subject: [PATCH 035/444] =?UTF-8?q?Fix=20#1047.=20=D0=98=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=81=D1=81=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=20=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=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/FunctionNameStartsWithGet.md    | 2 +-
 docs/en/diagnostics/FunctionNameStartsWithGet.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/diagnostics/FunctionNameStartsWithGet.md b/docs/diagnostics/FunctionNameStartsWithGet.md
index ac1bc0668d0..4abe3f01a51 100644
--- a/docs/diagnostics/FunctionNameStartsWithGet.md
+++ b/docs/diagnostics/FunctionNameStartsWithGet.md
@@ -20,7 +20,7 @@
 
 
 ## Источники
-* Источник: [Стандарт: Имена процедур и функций п 6.1](its.1c.ru/db/v8std#content:647:hdoc)
+* Источник: [Стандарт: Имена процедур и функций п 6.1](https://its.1c.ru/db/v8std#content:647:hdoc)
 
 ## Сниппеты
 
diff --git a/docs/en/diagnostics/FunctionNameStartsWithGet.md b/docs/en/diagnostics/FunctionNameStartsWithGet.md
index dc14ff7f1ce..53d9a95356e 100644
--- a/docs/en/diagnostics/FunctionNameStartsWithGet.md
+++ b/docs/en/diagnostics/FunctionNameStartsWithGet.md
@@ -18,7 +18,7 @@ Function NameByCode()
 ```
 
 ## Sources
-* Source: [Standard: Names of procedures and functions c 6.1](its.1c.ru/db/v8std#content:647:hdoc)
+* Source: [Standard: Names of procedures and functions c 6.1](https://its.1c.ru/db/v8std#content:647:hdoc)
 
 ## Snippets
 

From f2ce76727ce3431591fe29658eb2294284cf5e41 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 11:10:02 +0300
Subject: [PATCH 036/444] Fix qf

---
 .../bsl/languageserver/BSLLSPLauncher.java    |  2 +-
 .../bsl/languageserver/BSLLanguageServer.java |  6 ++--
 .../languageserver/BSLWorkspaceService.java   |  2 +-
 .../languageserver/cli/AnalyzeCommand.java    |  2 +-
 .../bsl/languageserver/cli/FormatCommand.java |  4 +--
 .../cli/LanguageServerStartCommand.java       |  2 +-
 .../context/DocumentContext.java              | 20 +++++------
 .../computer/CognitiveComplexityComputer.java |  8 ++---
 .../context/computer/ComplexityData.java      | 10 +++---
 .../computer/ComplexitySecondaryLocation.java |  4 +--
 .../CyclomaticComplexityComputer.java         |  6 ++--
 .../computer/DiagnosticIgnoranceComputer.java |  4 +--
 .../computer/MethodSymbolComputer.java        |  2 +-
 .../computer/RegionSymbolComputer.java        |  6 ++--
 .../context/computer/SymbolTreeComputer.java  |  2 +-
 .../computer/VariableSymbolComputer.java      |  2 +-
 .../languageserver/context/symbol/Symbol.java |  6 ++--
 .../diagnostics/AbstractDiagnostic.java       |  2 +-
 .../AbstractListenerDiagnostic.java           |  2 +-
 .../AbstractVisitorDiagnostic.java            |  2 +-
 .../CanonicalSpellingKeywordsDiagnostic.java  |  4 +--
 .../CodeOutOfRegionDiagnostic.java            |  2 +-
 .../CreateQueryInCycleDiagnostic.java         |  8 ++---
 .../DeprecatedTypeManagedFormDiagnostic.java  |  2 +-
 .../diagnostics/DiagnosticStorage.java        |  4 +--
 .../diagnostics/DiagnosticSupplier.java       |  2 +-
 .../IfElseDuplicatedCodeBlockDiagnostic.java  |  2 +-
 .../IfElseDuplicatedConditionDiagnostic.java  |  2 +-
 .../diagnostics/LineLengthDiagnostic.java     |  2 +-
 .../diagnostics/MissingSpaceDiagnostic.java   |  2 +-
 ...issingTemporaryFileDeletionDiagnostic.java |  2 +-
 .../NestedStatementsDiagnostic.java           |  2 +-
 .../OneStatementPerLineDiagnostic.java        |  2 +-
 .../PairingBrokenTransactionDiagnostic.java   | 10 +++---
 .../SpaceAtStartCommentDiagnostic.java        |  9 +++--
 .../UnreachableCodeDiagnostic.java            |  4 +--
 .../UsingFindElementByStringDiagnostic.java   |  2 +-
 .../UsingModalWindowsDiagnostic.java          |  4 +--
 .../UsingSynchronousCallsDiagnostic.java      |  2 +-
 .../diagnostics/YoLetterUsageDiagnostic.java  |  2 +-
 .../metadata/DiagnosticCompatibilityMode.java |  2 +-
 .../diagnostics/metadata/DiagnosticInfo.java  |  6 ++--
 .../reporter/GenericIssueReport.java          | 36 +++++++++----------
 .../diagnostics/reporter/JUnitTestSuites.java | 16 ++++-----
 .../reporter/TSLintReportEntry.java           |  2 +-
 .../diagnostics/typo/JLanguageToolPool.java   |  2 +-
 .../providers/FoldingRangeProvider.java       | 10 +++---
 .../utils/AbstractObjectPool.java             |  4 +--
 .../utils/MultilingualStringAnalyser.java     |  4 +--
 .../MethodSizeDiagnostic_en.properties        |  2 +-
 .../MissingSpaceDiagnostic_en.properties      |  2 --
 .../MissingSpaceDiagnostic_ru.properties      |  2 --
 .../NonStandardRegionDiagnostic_ru.properties |  2 +-
 ...ngSynchronousCallsDiagnostic_en.properties |  2 +-
 .../BSLTextDocumentServiceTest.java           |  2 +-
 .../reporter/GenericReporterTest.java         |  2 +-
 .../reporter/JUnitReporterTest.java           |  2 +-
 .../reporter/JsonReporterTest.java            |  2 +-
 .../reporter/TSLintReporterTest.java          |  2 +-
 59 files changed, 130 insertions(+), 135 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 6fab3f12b86..ec17fdea384 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -40,7 +40,7 @@ public class BSLLSPLauncher {
 
   public static final String APP_NAME = "BSL language server";
 
-  private static Options options = createOptions();
+  private static final Options options = createOptions();
 
   public static void main(String[] args) {
     CommandLineParser parser = new DefaultParser();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
index b3810b6ebb7..24e77222dc7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
@@ -46,10 +46,10 @@
 public class BSLLanguageServer implements LanguageServer, LanguageClientAware {
 
   private final LanguageServerConfiguration configuration;
-  private BSLTextDocumentService textDocumentService;
-  private BSLWorkspaceService workspaceService;
+  private final BSLTextDocumentService textDocumentService;
+  private final BSLWorkspaceService workspaceService;
   private boolean shutdownWasCalled;
-  private ServerContext context;
+  private final ServerContext context;
 
   public BSLLanguageServer(LanguageServerConfiguration configuration) {
     this.configuration = configuration;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLWorkspaceService.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLWorkspaceService.java
index 6f46da62742..a977efb5f49 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLWorkspaceService.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLWorkspaceService.java
@@ -35,7 +35,7 @@
 
 public class BSLWorkspaceService implements WorkspaceService {
 
-  private LanguageServerConfiguration configuration;
+  private final LanguageServerConfiguration configuration;
 
   public BSLWorkspaceService(LanguageServerConfiguration configuration) {
     this.configuration = configuration;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 9629f8a9930..d59471edc28 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -70,7 +70,7 @@
  */
 public class AnalyzeCommand implements Command {
 
-  private CommandLine cmd;
+  private final CommandLine cmd;
   private DiagnosticProvider diagnosticProvider;
   private ServerContext context;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index e2b84b52990..a622840df1d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -56,8 +56,8 @@
  */
 public class FormatCommand implements Command {
 
-  private CommandLine cmd;
-  private ServerContext serverContext;
+  private final CommandLine cmd;
+  private final ServerContext serverContext;
 
   public FormatCommand(CommandLine cmd) {
     this.cmd = cmd;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
index d4fb32ca6d5..d75ada08096 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -53,7 +53,7 @@
 @Slf4j
 public class LanguageServerStartCommand implements Command {
 
-  private CommandLine cmd;
+  private final CommandLine cmd;
 
   public LanguageServerStartCommand(CommandLine cmd) {
     this.cmd = cmd;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index 10b5b4a5237..3b9fa8c6823 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -62,23 +62,23 @@ public class DocumentContext {
   private final URI uri;
   private final FileType fileType;
   private String content;
-  private ServerContext context;
+  private final ServerContext context;
   private Tokenizer tokenizer;
 
-  private ReentrantLock computeLock = new ReentrantLock();
+  private final ReentrantLock computeLock = new ReentrantLock();
 
-  private Lazy<String[]> contentList = new Lazy<>(this::computeContentList, computeLock);
-  private Lazy<ModuleType> moduleType = new Lazy<>(this::computeModuleType, computeLock);
-  private Lazy<Map<SupportConfiguration, SupportVariant>> supportVariants
+  private final Lazy<String[]> contentList = new Lazy<>(this::computeContentList, computeLock);
+  private final Lazy<ModuleType> moduleType = new Lazy<>(this::computeModuleType, computeLock);
+  private final Lazy<Map<SupportConfiguration, SupportVariant>> supportVariants
     = new Lazy<>(this::computeSupportVariants, computeLock);
-  private Lazy<SymbolTree> symbolTree = new Lazy<>(this::computeSymbolTree, computeLock);
-  private Lazy<ComplexityData> cognitiveComplexityData
+  private final Lazy<SymbolTree> symbolTree = new Lazy<>(this::computeSymbolTree, computeLock);
+  private final Lazy<ComplexityData> cognitiveComplexityData
     = new Lazy<>(this::computeCognitiveComplexity, computeLock);
-  private Lazy<ComplexityData> cyclomaticComplexityData
+  private final Lazy<ComplexityData> cyclomaticComplexityData
     = new Lazy<>(this::computeCyclomaticComplexity, computeLock);
-  private Lazy<DiagnosticIgnoranceComputer.Data> diagnosticIgnoranceData
+  private final Lazy<DiagnosticIgnoranceComputer.Data> diagnosticIgnoranceData
     = new Lazy<>(this::computeDiagnosticIgnorance, computeLock);
-  private Lazy<MetricStorage> metrics = new Lazy<>(this::computeMetrics, computeLock);
+  private final Lazy<MetricStorage> metrics = new Lazy<>(this::computeMetrics, computeLock);
 
   public DocumentContext(URI uri, String content, ServerContext context) {
     this.uri = Absolute.uri(uri);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java
index a3db366cf42..66b0bd94d9f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java
@@ -52,15 +52,15 @@ public class CognitiveComplexityComputer
 
   private int fileComplexity;
   private int fileCodeBlockComplexity;
-  private List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
+  private final List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
 
-  private Map<MethodSymbol, Integer> methodsComplexity;
-  private Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
+  private final Map<MethodSymbol, Integer> methodsComplexity;
+  private final Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
 
   private MethodSymbol currentMethod;
   private int complexity;
   private int nestedLevel;
-  private Set<BSLParserRuleContext> ignoredContexts;
+  private final Set<BSLParserRuleContext> ignoredContexts;
 
   public CognitiveComplexityComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexityData.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexityData.java
index 463b1c323b5..e3641c087f0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexityData.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexityData.java
@@ -31,10 +31,10 @@
 @Value
 @AllArgsConstructor
 public class ComplexityData {
-  private final int fileComplexity;
-  private final int fileCodeBlockComplexity;
-  private List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
+  int fileComplexity;
+  int fileCodeBlockComplexity;
+  List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
 
-  private final Map<MethodSymbol, Integer> methodsComplexity;
-  private Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
+  Map<MethodSymbol, Integer> methodsComplexity;
+  Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexitySecondaryLocation.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexitySecondaryLocation.java
index 31fbfb1aa78..1d25863ffb2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexitySecondaryLocation.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ComplexitySecondaryLocation.java
@@ -28,6 +28,6 @@
 @Value
 @AllArgsConstructor
 public class ComplexitySecondaryLocation {
-  private final Range range;
-  private final String message;
+  Range range;
+  String message;
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java
index eb607701023..beb91400c64 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/CyclomaticComplexityComputer.java
@@ -49,10 +49,10 @@ public class CyclomaticComplexityComputer
 
   private int fileComplexity;
   private int fileCodeBlockComplexity;
-  private List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
+  private final List<ComplexitySecondaryLocation> fileBlockComplexitySecondaryLocations;
 
-  private Map<MethodSymbol, Integer> methodsComplexity;
-  private Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
+  private final Map<MethodSymbol, Integer> methodsComplexity;
+  private final Map<MethodSymbol, List<ComplexitySecondaryLocation>> methodsComplexitySecondaryLocations;
 
   private MethodSymbol currentMethod;
   private int complexity;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
index 39c66af9160..e04f9527a64 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
@@ -64,8 +64,8 @@ public class DiagnosticIgnoranceComputer implements Computer<DiagnosticIgnorance
 
   private final DocumentContext documentContext;
 
-  private Map<DiagnosticCode, List<Range<Integer>>> diagnosticIgnorance = new HashMap<>();
-  private Map<DiagnosticCode, Deque<Integer>> ignoranceStack = new HashMap<>();
+  private final Map<DiagnosticCode, List<Range<Integer>>> diagnosticIgnorance = new HashMap<>();
+  private final Map<DiagnosticCode, Deque<Integer>> ignoranceStack = new HashMap<>();
 
   public DiagnosticIgnoranceComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index 73f5ccab7a1..b90fd7c323f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -46,7 +46,7 @@ public final class MethodSymbolComputer
   implements Computer<List<MethodSymbol>> {
 
   private final DocumentContext documentContext;
-  private List<MethodSymbol> methods = new ArrayList<>();
+  private final List<MethodSymbol> methods = new ArrayList<>();
 
   public MethodSymbolComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
index 2416a190586..b0179f21738 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
@@ -43,9 +43,9 @@ public final class RegionSymbolComputer
   implements Computer<List<RegionSymbol>> {
 
   private final DocumentContext documentContext;
-  private Deque<Pair<RegionSymbol.RegionSymbolBuilder, BSLParser.RegionStartContext>> regionStack = new ArrayDeque<>();
-  private List<RegionSymbol> regions = new ArrayList<>();
-  private List<BSLParserRuleContext> allNodes = new ArrayList<>();
+  private final Deque<Pair<RegionSymbol.RegionSymbolBuilder, BSLParser.RegionStartContext>> regionStack = new ArrayDeque<>();
+  private final List<RegionSymbol> regions = new ArrayList<>();
+  private final List<BSLParserRuleContext> allNodes = new ArrayList<>();
 
   public RegionSymbolComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/SymbolTreeComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/SymbolTreeComputer.java
index 87aa63e994b..78d5008ddd9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/SymbolTreeComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/SymbolTreeComputer.java
@@ -36,7 +36,7 @@
 
 public class SymbolTreeComputer implements Computer<SymbolTree> {
 
-  private DocumentContext documentContext;
+  private final DocumentContext documentContext;
 
   public SymbolTreeComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
index d17795f8005..31d46a950ad 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
@@ -40,7 +40,7 @@
 public class VariableSymbolComputer extends BSLParserBaseVisitor<ParseTree> implements Computer<List<VariableSymbol>> {
 
   private final DocumentContext documentContext;
-  private List<VariableSymbol> variables = new ArrayList<>();
+  private final List<VariableSymbol> variables = new ArrayList<>();
 
   public VariableSymbolComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
index 07d04287b65..87638ac472e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
@@ -50,10 +50,10 @@ default Optional<Symbol> getRootParent() {
 
   static Symbol emptySymbol() {
     return new Symbol() {
-      @Getter private String name = "empty";
-      @Getter private Range range = Ranges.create(-1, 0, -1, 0);
+      @Getter private final String name = "empty";
+      @Getter private final Range range = Ranges.create(-1, 0, -1, 0);
       @Getter @Setter private Optional<Symbol> parent = Optional.empty();
-      @Getter private List<Symbol> children = Collections.emptyList();
+      @Getter private final List<Symbol> children = Collections.emptyList();
     };
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
index 8a64b2ba232..f175f8a24ad 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
@@ -30,7 +30,7 @@
 public abstract class AbstractDiagnostic implements BSLDiagnostic {
 
   protected final DiagnosticInfo info;
-  protected DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
+  protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
 
   public AbstractDiagnostic(DiagnosticInfo info) {
     this.info = info;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractListenerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractListenerDiagnostic.java
index 1c1cb8a45f4..ba2b33da4d4 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractListenerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractListenerDiagnostic.java
@@ -32,7 +32,7 @@
 public abstract class AbstractListenerDiagnostic extends BSLParserBaseListener implements BSLDiagnostic {
 
   protected final DiagnosticInfo info;
-  protected DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
+  protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
   protected DocumentContext documentContext;
 
   public AbstractListenerDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractVisitorDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractVisitorDiagnostic.java
index af11457eee2..4965869e53b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractVisitorDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractVisitorDiagnostic.java
@@ -32,7 +32,7 @@
 public abstract class AbstractVisitorDiagnostic extends BSLParserBaseVisitor<ParseTree> implements BSLDiagnostic {
 
   protected final DiagnosticInfo info;
-  protected DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
+  protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
   protected DocumentContext documentContext;
 
   public AbstractVisitorDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index bf452db42f7..42f63ed8678 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -53,8 +53,8 @@
 )
 public class CanonicalSpellingKeywordsDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
-  private static Map<Integer, List<String>> canonicalKeywords = getPreset();
-  private static Map<String, String> canonicalStrings = getCanonical();
+  private static final Map<Integer, List<String>> canonicalKeywords = getPreset();
+  private static final Map<String, String> canonicalStrings = getCanonical();
 
   public CanonicalSpellingKeywordsDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
index f4446e229f1..f0f4fe73874 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java
@@ -56,7 +56,7 @@
   compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_1
 )
 public class CodeOutOfRegionDiagnostic extends AbstractVisitorDiagnostic {
-  private List<Range> regionsRanges = new ArrayList<>();
+  private final List<Range> regionsRanges = new ArrayList<>();
 
   public CodeOutOfRegionDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
index 7b0a2a1c53f..8c8ad3da753 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
@@ -302,8 +302,8 @@ public enum CodeFlowType {
 
   @ToString
   public static class VariableDefinition {
-    private String variableName;
-    private Set<String> types = new HashSet<>();
+    private final String variableName;
+    private final Set<String> types = new HashSet<>();
     private ParseTree firstDeclaration;
 
     VariableDefinition(String variableName) {
@@ -324,7 +324,7 @@ public void addDeclaration(ParseTree firstDeclaration) {
   private static class Scope {
     private final String name;
 
-    private HashMap<String, VariableDefinition> variables = new HashMap<>();
+    private final HashMap<String, VariableDefinition> variables = new HashMap<>();
 
     public Scope(String name) {
       this.name = name;
@@ -350,7 +350,7 @@ public String getName() {
   }
 
   private static class VariableScope extends ArrayDeque<Scope> {
-    private Deque<CodeFlowType> flowMode = new ArrayDeque<>();
+    private final Deque<CodeFlowType> flowMode = new ArrayDeque<>();
 
     public boolean codeFlowInCycle() {
       final CodeFlowType flowType = flowMode.peek();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
index e7c99c9f14a..d02c3690f45 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
@@ -76,7 +76,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       .map(BSLParser.GlobalMethodCallContext::doCall)
       .map(BSLParser.DoCallContext::callParamList)
       .filter(callParamList -> paramPattern.matcher(callParamList.getText()).matches())
-      .ifPresent(callParamList -> diagnosticStorage.addDiagnostic(callParamList));
+      .ifPresent(diagnosticStorage::addDiagnostic);
 
     return super.visitGlobalMethodCall(ctx);
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticStorage.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticStorage.java
index bf5fd1f7442..945505942b0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticStorage.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticStorage.java
@@ -39,8 +39,8 @@
 
 public class DiagnosticStorage {
 
-  private BSLDiagnostic diagnostic;
-  private Queue<Diagnostic> diagnosticList = new ConcurrentLinkedQueue<>();
+  private final BSLDiagnostic diagnostic;
+  private final Queue<Diagnostic> diagnosticList = new ConcurrentLinkedQueue<>();
 
   DiagnosticStorage(BSLDiagnostic diagnostic) {
     this.diagnostic = diagnostic;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index 3e5f62f57ee..31eb9c99ea3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -52,7 +52,7 @@
 public class DiagnosticSupplier {
 
   private final LanguageServerConfiguration configuration;
-  private static List<Class<? extends BSLDiagnostic>> diagnosticClasses = createDiagnosticClasses();
+  private static final List<Class<? extends BSLDiagnostic>> diagnosticClasses = createDiagnosticClasses();
 
   public DiagnosticSupplier(LanguageServerConfiguration configuration) {
     this.configuration = configuration;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java
index dc99d4503dc..9f887ab6d03 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedCodeBlockDiagnostic.java
@@ -53,7 +53,7 @@
 public class IfElseDuplicatedCodeBlockDiagnostic extends AbstractVisitorDiagnostic {
 
   private final String relatedMessage;
-  private Set<BSLParser.CodeBlockContext> checkedBlocks = new HashSet<>();
+  private final Set<BSLParser.CodeBlockContext> checkedBlocks = new HashSet<>();
 
   public IfElseDuplicatedCodeBlockDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java
index e9f4be9ced6..a76524e8c4e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IfElseDuplicatedConditionDiagnostic.java
@@ -53,7 +53,7 @@
 public class IfElseDuplicatedConditionDiagnostic extends AbstractVisitorDiagnostic {
 
   private final String relatedMessage;
-  private Set<BSLParser.ExpressionContext> checkedConditions = new HashSet<>();
+  private final Set<BSLParser.ExpressionContext> checkedConditions = new HashSet<>();
 
   public IfElseDuplicatedConditionDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
index 15dc31dcafc..b4c4b1a6f11 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
@@ -56,7 +56,7 @@ public class LineLengthDiagnostic extends AbstractDiagnostic {
     defaultValue = "" + MAX_LINE_LENGTH
   )
   private int maxLineLength = MAX_LINE_LENGTH;
-  private Map<Integer, List<Integer>> tokensInOneLine = new HashMap<>();
+  private final Map<Integer, List<Integer>> tokensInOneLine = new HashMap<>();
 
   public LineLengthDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
index 7338e64b072..68f49db782b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
@@ -107,7 +107,7 @@ public class MissingSpaceDiagnostic extends AbstractVisitorDiagnostic implements
   private Pattern patternL = compilePattern(listForCheckLeft);
   private Pattern patternR = compilePattern(listForCheckRight);
   private Pattern patternLr = compilePattern(listForCheckLeftAndRight);
-  private Pattern patternNotSpace = compilePattern("\\S+");
+  private final Pattern patternNotSpace = compilePattern("\\S+");
 
   public MissingSpaceDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
index 86de04d471c..28df878d75c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
@@ -133,7 +133,7 @@ private boolean foundDeleteFile(BSLParser.CodeBlockContext codeBlockContext, Str
 
       BSLParser.GlobalMethodCallContext localGlobalMethodCall = localCallStatementContext.globalMethodCall();
       // получаем full call method и полное имя вызова
-      String fullCallMethod = "";
+      String fullCallMethod;
       BSLParser.DoCallContext doCallContext;
       if (localGlobalMethodCall == null) {
         fullCallMethod = getFullCallMethod(localCallStatementContext);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java
index 6c7bbc015d7..40d63921c47 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NestedStatementsDiagnostic.java
@@ -64,7 +64,7 @@ public class NestedStatementsDiagnostic extends AbstractListenerDiagnostic {
   private int maxAllowedLevel = MAX_ALLOWED_LEVEL;
 
   private ParseTree lastCtx;
-  private Deque<ParseTree> nestedParents = new ArrayDeque<>();
+  private final Deque<ParseTree> nestedParents = new ArrayDeque<>();
 
   public NestedStatementsDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
index 7a8400c30c0..9117679f4cc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
@@ -59,7 +59,7 @@ public class OneStatementPerLineDiagnostic extends AbstractVisitorDiagnostic imp
     "^(\\s+?)[^\\s]",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private int previousLineNumber;
-  private List<BSLParser.StatementContext> statementsPerLine = new ArrayList<>();
+  private final List<BSLParser.StatementContext> statementsPerLine = new ArrayList<>();
 
   public OneStatementPerLineDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
index d24a798bec3..abff7294f17 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
@@ -47,19 +47,19 @@
 )
 public class PairingBrokenTransactionDiagnostic extends AbstractVisitorDiagnostic {
 
-  private Pattern beginTransaction = Pattern.compile("НачатьТранзакцию|BeginTransaction",
+  private final Pattern beginTransaction = Pattern.compile("НачатьТранзакцию|BeginTransaction",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private Pattern beginEndTransaction = Pattern.compile(
+  private final Pattern beginEndTransaction = Pattern.compile(
     "ЗафиксироватьТранзакцию|CommitTransaction|НачатьТранзакцию|BeginTransaction",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private Pattern beginCancelTransaction = Pattern.compile(
+  private final Pattern beginCancelTransaction = Pattern.compile(
     "ОтменитьТранзакцию|RollbackTransaction|НачатьТранзакцию|BeginTransaction",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private HashMap<String, String> pairMethodsBeginEnd = new HashMap<>();
-  private HashMap<String, String> pairMethodsBeginCancel = new HashMap<>();
+  private final HashMap<String, String> pairMethodsBeginEnd = new HashMap<>();
+  private final HashMap<String, String> pairMethodsBeginCancel = new HashMap<>();
 
   public PairingBrokenTransactionDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
index d68082a5247..4151a662d2b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
@@ -63,9 +63,9 @@ public class SpaceAtStartCommentDiagnostic implements QuickFixProvider, BSLDiagn
   private static final int COMMENT_LENGTH = 2;
 
   private static final float COMMENTED_CODE_THRESHOLD = 0.9F;
-  protected DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
-  private CodeRecognizer codeRecognizer;
-  private DiagnosticInfo info;
+  protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
+  private final CodeRecognizer codeRecognizer;
+  private final DiagnosticInfo info;
 
   @DiagnosticParameter(
     type = String.class,
@@ -113,8 +113,7 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
           && !commentsAnnotation.matcher(t.getText()).matches()
           && !codeRecognizer.meetsCondition(t.getText()))
       .sequential()
-      .forEach((Token t) ->
-        diagnosticStorage.addDiagnostic(t));
+      .forEach(diagnosticStorage::addDiagnostic);
 
     return diagnosticStorage.getDiagnostics();
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
index f4e9e2b1291..4d245a1a155 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
@@ -54,10 +54,10 @@
 public class UnreachableCodeDiagnostic extends AbstractVisitorDiagnostic {
 
   // кэш диапазонов зарегистрированных ошибок
-  private List<Range> errorRanges = new ArrayList<>();
+  private final List<Range> errorRanges = new ArrayList<>();
 
   // диапазоны препроцессорных скобок
-  private List<Range> preprocessorRanges = new ArrayList<>();
+  private final List<Range> preprocessorRanges = new ArrayList<>();
 
   public UnreachableCodeDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
index 001cbdaef98..f071145c91d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
@@ -47,7 +47,7 @@
 
 public class UsingFindElementByStringDiagnostic extends AbstractVisitorDiagnostic {
 
-  private Pattern pattern = Pattern.compile(
+  private final Pattern pattern = Pattern.compile(
     "(НайтиПоНаименованию|FindByDescription|НайтиПоКоду|FindByCode)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
index 4d2ead6fa4b..ebc25f7e5e2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class UsingModalWindowsDiagnostic extends AbstractVisitorDiagnostic {
 
-  private Pattern modalityMethods = Pattern.compile(
+  private final Pattern modalityMethods = Pattern.compile(
     "(ВОПРОС|DOQUERYBOX|ОТКРЫТЬФОРМУМОДАЛЬНО|OPENFORMMODAL|ОТКРЫТЬЗНАЧЕНИЕ|OPENVALUE|" +
       "ПРЕДУПРЕЖДЕНИЕ|DOMESSAGEBOX|ВВЕСТИДАТУ|INPUTDATE|ВВЕСТИЗНАЧЕНИЕ|INPUTVALUE|" +
       "ВВЕСТИСТРОКУ|INPUTSTRING|ВВЕСТИЧИСЛО|INPUTNUMBER|УСТАНОВИТЬВНЕШНЮЮКОМПОНЕНТУ|INSTALLADDIN|" +
@@ -54,7 +54,7 @@ public class UsingModalWindowsDiagnostic extends AbstractVisitorDiagnostic {
       "УСТАНОВИТЬРАСШИРЕНИЕРАБОТЫСКРИПТОГРАФИЕЙ|INSTALLCRYPTOEXTENSION|ПОМЕСТИТЬФАЙЛ|PUTFILE)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private HashMap<String, String> pairMethods = new HashMap<>();
+  private final HashMap<String, String> pairMethods = new HashMap<>();
 
   public UsingModalWindowsDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
index 50ac4b07077..76dd40a94f0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
@@ -64,7 +64,7 @@ public class UsingSynchronousCallsDiagnostic extends AbstractVisitorDiagnostic {
     "(НаСервере|НаСервереБезКонтекста|AtServer|AtServerNoContext)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private HashMap<String, String> pairMethods = new HashMap<>();
+  private final HashMap<String, String> pairMethods = new HashMap<>();
 
   public UsingSynchronousCallsDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
index 54db0f430f2..df6c59f223d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
@@ -53,7 +53,7 @@ protected void check(DocumentContext documentContext) {
       .filter((Token t) ->
         t.getType() == BSLParser.IDENTIFIER &&
           t.getText().toUpperCase(Locale.ENGLISH).contains("Ё"))
-      .forEach(token -> diagnosticStorage.addDiagnostic(token));
+      .forEach(diagnosticStorage::addDiagnostic);
   }
 
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
index ca770df5509..f3189bcec57 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
@@ -45,7 +45,7 @@ public enum DiagnosticCompatibilityMode {
   COMPATIBILITY_MODE_8_3_15(3, 15),
   COMPATIBILITY_MODE_8_3_16(3, 16);
 
-  private CompatibilityMode compatibilityMode;
+  private final CompatibilityMode compatibilityMode;
 
   DiagnosticCompatibilityMode(int minor, int version) {
     this.compatibilityMode = new CompatibilityMode(minor, version);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
index 39213d610b0..aeafee2ec08 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
@@ -45,15 +45,15 @@
 @Slf4j
 public class DiagnosticInfo {
 
-  private static Map<DiagnosticSeverity, org.eclipse.lsp4j.DiagnosticSeverity> severityToLSPSeverityMap
+  private static final Map<DiagnosticSeverity, org.eclipse.lsp4j.DiagnosticSeverity> severityToLSPSeverityMap
     = createSeverityToLSPSeverityMap();
 
   private final Class<? extends BSLDiagnostic> diagnosticClass;
   private final DiagnosticLanguage diagnosticLanguage;
 
   private final DiagnosticCode diagnosticCode;
-  private DiagnosticMetadata diagnosticMetadata;
-  private List<DiagnosticParameterInfo> diagnosticParameters;
+  private final DiagnosticMetadata diagnosticMetadata;
+  private final List<DiagnosticParameterInfo> diagnosticParameters;
 
   public DiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass, DiagnosticLanguage diagnosticLanguage) {
     this.diagnosticClass = diagnosticClass;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
index ec808c1a73c..8ddb97aca14 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
@@ -55,10 +55,10 @@ public class GenericIssueReport {
   private static final String SEVERITY_MINOR = "MINOR";
 
   // TODO: пробросить из analyze?
-  private static LanguageServerConfiguration configuration = LanguageServerConfiguration.create();
-  private static DiagnosticSupplier diagnosticSupplier = new DiagnosticSupplier(configuration);
-  private static Map<DiagnosticSeverity, String> severityMap = new EnumMap<>(DiagnosticSeverity.class);
-  private static Map<DiagnosticSeverity, String> typeMap = new EnumMap<>(DiagnosticSeverity.class);
+  private static final LanguageServerConfiguration configuration = LanguageServerConfiguration.create();
+  private static final DiagnosticSupplier diagnosticSupplier = new DiagnosticSupplier(configuration);
+  private static final Map<DiagnosticSeverity, String> severityMap = new EnumMap<>(DiagnosticSeverity.class);
+  private static final Map<DiagnosticSeverity, String> typeMap = new EnumMap<>(DiagnosticSeverity.class);
 
   static {
     severityMap.put(DiagnosticSeverity.Error, SEVERITY_CRITICAL);
@@ -101,13 +101,13 @@ public GenericIssueReport(AnalysisInfo analysisInfo) {
   @Value
   static class GenericIssueEntry {
 
-    private final String engineId;
-    private final String ruleId;
-    private final String severity;
-    private final String type;
-    private final Location primaryLocation;
-    private final int effortMinutes;
-    private final List<Location> secondaryLocations;
+    String engineId;
+    String ruleId;
+    String severity;
+    String type;
+    Location primaryLocation;
+    int effortMinutes;
+    List<Location> secondaryLocations;
 
     public GenericIssueEntry(
       @JsonProperty("engineId") String engineId,
@@ -161,9 +161,9 @@ public GenericIssueEntry(String fileName, Diagnostic diagnostic) {
   @Value
   static class Location {
 
-    private final String message;
-    private final String filePath;
-    private final TextRange textRange;
+    String message;
+    String filePath;
+    TextRange textRange;
 
     public Location(
       @JsonProperty("message") String message,
@@ -191,10 +191,10 @@ public Location(DiagnosticRelatedInformation relatedInformation) {
   @Value
   static class TextRange {
 
-    private final int startLine;
-    private final int endLine;
-    private final int startColumn;
-    private final int endColumn;
+    int startLine;
+    int endLine;
+    int startColumn;
+    int endColumn;
 
     public TextRange(
       @JsonProperty("startLine") int startLine,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitTestSuites.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitTestSuites.java
index 82e236bda25..bb59dddb194 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitTestSuites.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitTestSuites.java
@@ -80,10 +80,10 @@ public JUnitTestSuites(
   static class JUnitTestSuite {
 
     @JacksonXmlProperty(isAttribute = true)
-    private final String name;
+    String name;
 
     @JacksonXmlElementWrapper(useWrapping = false)
-    private final List<JUnitTestCase> testcase;
+    List<JUnitTestCase> testcase;
 
     public JUnitTestSuite(FileInfo fileInfo) {
       this.name = fileInfo.getPath().toString();
@@ -114,13 +114,13 @@ public JUnitTestSuite(
   static class JUnitTestCase {
 
     @JacksonXmlProperty(isAttribute = true)
-    private final String name;
+    String name;
 
     @JacksonXmlProperty(isAttribute = true)
-    private final String classname;
+    String classname;
 
     @JacksonXmlElementWrapper(useWrapping = false)
-    private final JUnitFailure failure;
+    JUnitFailure failure;
 
     public JUnitTestCase(List<Diagnostic> diagnostics, String name, String classname) {
       this.name = name;
@@ -161,14 +161,14 @@ public JUnitTestCase(
   static class JUnitFailure {
 
     @JacksonXmlProperty(isAttribute = true)
-    private final String type;
+    String type;
 
     @JacksonXmlProperty(isAttribute = true)
-    private final String message;
+    String message;
 
     @JacksonXmlText
     @JacksonXmlCData
-    private final String value;
+    String value;
   }
 
   static class JUnitFailureDeserializer extends JsonDeserializer<JUnitFailure> {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReportEntry.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReportEntry.java
index 820ad99a0b2..47aef14cb7f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReportEntry.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReportEntry.java
@@ -44,7 +44,7 @@ class TSLintReportEntry {
   @Getter
   private final String ruleSeverity;
 
-  private static Map<DiagnosticSeverity, String> severityMap = new EnumMap<>(DiagnosticSeverity.class);
+  private static final Map<DiagnosticSeverity, String> severityMap = new EnumMap<>(DiagnosticSeverity.class);
 
   static {
     severityMap.put(DiagnosticSeverity.Error, "error");
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/JLanguageToolPool.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/JLanguageToolPool.java
index 0e20a4b643c..578050f42ec 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/JLanguageToolPool.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/typo/JLanguageToolPool.java
@@ -28,7 +28,7 @@
 @AllArgsConstructor
 public class JLanguageToolPool extends AbstractObjectPool<JLanguageToolPoolEntry> {
 
-  private Language language;
+  private final Language language;
 
   @Override
   protected JLanguageToolPoolEntry create() {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FoldingRangeProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FoldingRangeProvider.java
index 3e35282d67c..48c0a89ac07 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FoldingRangeProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FoldingRangeProvider.java
@@ -106,7 +106,7 @@ private static List<FoldingRange> getCommentRanges(DocumentContext documentConte
 
   private static class UseRangeFinder extends BSLParserBaseVisitor<ParseTree> {
 
-    private List<FoldingRange> regionRanges = new ArrayList<>();
+    private final List<FoldingRange> regionRanges = new ArrayList<>();
 
     public List<FoldingRange> getRegionRanges() {
       return new ArrayList<>(regionRanges);
@@ -135,7 +135,7 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
 
   private static class CodeBlockRangeFinder extends BSLParserBaseVisitor<ParseTree> {
 
-    private List<FoldingRange> regionRanges = new ArrayList<>();
+    private final List<FoldingRange> regionRanges = new ArrayList<>();
 
     public List<FoldingRange> getRegionRanges() {
       return new ArrayList<>(regionRanges);
@@ -202,7 +202,7 @@ private void addRegionRange(TerminalNode start, TerminalNode stop) {
 
   private static class RegionRangeFinder {
 
-    private List<FoldingRange> regionRanges;
+    private final List<FoldingRange> regionRanges;
 
     RegionRangeFinder(DocumentContext documentContext) {
       regionRanges = documentContext.getSymbolTree().getRegionsFlat().stream()
@@ -229,8 +229,8 @@ private static FoldingRange toFoldingRange(RegionSymbol regionSymbol) {
 
   private static class PreprocIfRegionRangeFinder extends BSLParserBaseVisitor<ParseTree> {
 
-    private Deque<BSLParser.Preproc_ifContext> preprocIfRegionStack = new ArrayDeque<>();
-    private List<FoldingRange> regionRanges = new ArrayList<>();
+    private final Deque<BSLParser.Preproc_ifContext> preprocIfRegionStack = new ArrayDeque<>();
+    private final List<FoldingRange> regionRanges = new ArrayList<>();
 
     public List<FoldingRange> getRegionRanges() {
       return new ArrayList<>(regionRanges);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/AbstractObjectPool.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/AbstractObjectPool.java
index 798aa3780f8..d8a8d11ec0d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/AbstractObjectPool.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/AbstractObjectPool.java
@@ -55,8 +55,8 @@
  */
 public abstract class AbstractObjectPool<T> {
 
-  private Set<T> available = new HashSet<>();
-  private Set<T> inUse = new HashSet<>();
+  private final Set<T> available = new HashSet<>();
+  private final Set<T> inUse = new HashSet<>();
 
   protected abstract T create();
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
index 16fa3eb94a0..b0a7c618227 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
@@ -63,8 +63,8 @@ public final class MultilingualStringAnalyser {
   private BSLParser.GlobalMethodCallContext globalMethodCallContext;
   private boolean isParentTemplate;
   private String variableName;
-  private ArrayList<String> expectedLanguages;
-  private Set<String> expandedMultilingualString = new HashSet<>();
+  private final ArrayList<String> expectedLanguages;
+  private final Set<String> expandedMultilingualString = new HashSet<>();
   private ArrayList<String> missingLanguages = new ArrayList<>();
 
   public MultilingualStringAnalyser(String declaredLanguages) {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic_en.properties
index df050240fcd..7299e50ed17 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic_en.properties
@@ -1,4 +1,4 @@
 diagnosticMessage=Method "%s" has %d lines, which is greater than the %d lines authorized
-diagnosticName=Method size 
+diagnosticName=Method size
 
 maxMethodSize=Max method line count.
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_en.properties
index bec90ae9005..bc529e8370b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_en.properties
@@ -4,8 +4,6 @@ quickFixMessage=Add space
 wordLeft=To the left
 wordRight=To the right
 wordLeftAndRight=Left and right
-wordLeftOrRight=Left or right
-
 listForCheckLeft=List of symbols to check for the space to the left of (separated by space)
 listForCheckRight=List of symbols to check for the space to the right of (separated by space)
 listForCheckLeftAndRight=List of symbols to check for the space from both sides of (separated by space)
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_ru.properties
index 4b5593bae29..254b9b3ce9e 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic_ru.properties
@@ -4,8 +4,6 @@ quickFixMessage=Добавить пробел
 wordLeft=Слева
 wordRight=Справа
 wordLeftAndRight=Слева и справа
-wordLeftOrRight=Слева или справа
-
 listForCheckLeft=Список символов для проверки слева (разделенные пробелом). Например: ) =
 listForCheckRight=Список символов для проверки справа (разделенные пробелом). Например: ( =
 listForCheckLeftAndRight=Список символов для проверки с обоих сторон (разделенные пробелом). Например: + - * / = % < >
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic_ru.properties
index 3aca60ece0d..47c5b302b45 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Нужно удалить нестандартный раздел "%s" 
+diagnosticMessage=Нужно удалить нестандартный раздел "%s"
 diagnosticName=Нестандартные разделы модуля
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic_en.properties
index 3e096606d23..0d083276ae1 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic_en.properties
@@ -1,4 +1,4 @@
 diagnosticMessage=Instead of the synchronous method `%s`, use `%s`
 diagnosticName=Using synchronous calls
 
-searchWords= Keywords for search hardcoded security information 
\ No newline at end of file
+searchWords= Keywords for search hardcoded security information
\ No newline at end of file
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentServiceTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentServiceTest.java
index c1921dba71c..90b4bd0006f 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentServiceTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentServiceTest.java
@@ -54,7 +54,7 @@
 
 class BSLTextDocumentServiceTest {
 
-  private BSLTextDocumentService textDocumentService = new BSLTextDocumentService(
+  private final BSLTextDocumentService textDocumentService = new BSLTextDocumentService(
     LanguageServerConfiguration.create(),
     new ServerContext());
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericReporterTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericReporterTest.java
index ff6f6ffa875..b7a4baab231 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericReporterTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericReporterTest.java
@@ -46,7 +46,7 @@
 
 class GenericReporterTest {
 
-  private File file = new File("./bsl-generic-json.json");
+  private final File file = new File("./bsl-generic-json.json");
 
   @BeforeEach
   void setUp() {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitReporterTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitReporterTest.java
index 76f64d4c6c1..799e23c26f0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitReporterTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JUnitReporterTest.java
@@ -46,7 +46,7 @@
 
 class JUnitReporterTest {
 
-  private File file = new File("./bsl-junit.xml");
+  private final File file = new File("./bsl-junit.xml");
 
   @BeforeEach
   void setUp() {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JsonReporterTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JsonReporterTest.java
index 02da59a9163..c3535aa15e5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JsonReporterTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/JsonReporterTest.java
@@ -42,7 +42,7 @@
 
 class JsonReporterTest {
 
-  private File file = new File("./bsl-json.json");
+  private final File file = new File("./bsl-json.json");
 
   @BeforeEach
   void setUp() {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReporterTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReporterTest.java
index f366d94a722..3e0f849e0be 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReporterTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/TSLintReporterTest.java
@@ -45,7 +45,7 @@
 
 class TSLintReporterTest {
 
-  private File file = new File("./bsl-tslint.json");
+  private final File file = new File("./bsl-tslint.json");
 
   @BeforeEach
   void setUp() {

From 6d046c7ff672041e9d7fe7808720ca4aa5ecf607 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Mon, 13 Apr 2020 12:28:49 +0300
Subject: [PATCH 037/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=82=D0=B5=D1=81=D1=82=20VariableSymbol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/computer/VariableSymbolTest.java  | 60 +++++++++++++++++++
 .../resources/providers/variableSymbol.bsl    | 11 ++++
 2 files changed, 71 insertions(+)
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
 create mode 100644 src/test/resources/providers/variableSymbol.bsl

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
new file mode 100644
index 00000000000..7d175562698
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
@@ -0,0 +1,60 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.context.computer;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class VariableSymbolTest {
+
+  @Test
+  void testVariableDescription() {
+
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/providers/variableSymbol.bsl");
+    List<VariableSymbol> variableSymbols = documentContext.getSymbolTree().getVariables();
+
+    assertThat(variableSymbols).hasSize(4);
+
+    assertThat(variableSymbols)
+      .filteredOn(variableSymbol -> variableSymbol.getDescription().isEmpty())
+      .hasSize(2)
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(1, 6, 1, 27)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(10, 6, 10, 34)))
+    ;
+
+    assertThat(variableSymbols)
+      .filteredOn(variableSymbol -> variableSymbol.getDescription().isPresent())
+      .hasSize(2)
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(4, 6, 4, 32)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(6, 6, 6, 33)))
+    ;
+
+  }
+
+}
diff --git a/src/test/resources/providers/variableSymbol.bsl b/src/test/resources/providers/variableSymbol.bsl
new file mode 100644
index 00000000000..134fe908fcf
--- /dev/null
+++ b/src/test/resources/providers/variableSymbol.bsl
@@ -0,0 +1,11 @@
+
+Перем ПеременнаяБезОписания;
+
+// Описание сверху
+Перем ПеременнаяСОписаниемСверху;
+
+Перем ПеременнаяСОписаниемВСтроке; // Описание в строке
+
+// Неверное описание
+
+Перем ПеременнаяСНевернымОписанием;

From 99a36a4dd971646616014532ca3f1ca82a181ec2 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Mon, 13 Apr 2020 12:52:59 +0300
Subject: [PATCH 038/444] =?UTF-8?q?=D0=92=20=D0=A0=D1=83=D0=BA=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D1=81=D1=82=D0=B2=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B1=D1=8C=D1=8E=D1=82=D0=BE=D1=80=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D1=82=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B7=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D1=8C=D1=8E=20"=D0=A1=D1=82=D1=80?=
 =?UTF-8?q?=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B0=20=D0=B4=D0=B8=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B8,=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2"=20#1048?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index f1ae581b385..460c600d682 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -8,8 +8,9 @@
   - [Настройка окружения](EnvironmentSetting.md)
   - [Быстрый старт](FastStart.md)
 - Разработка диагностик
-  - [Пример разработки диагностики](DiagnosticExample.md)
   - [Процесс (workflow) разработки диагностики](DiagnosticDevWorkFlow.md)
+  - [Пример разработки диагностики](DiagnosticExample.md)
+  - [Структура диагностики, назначение и содержимое файлов](DiagnosticStructure.md)
   - [Описание типов и важности диагностик](DiagnosticTypeAndSeverity.md)
   - [Тэги диагностик](DiagnosticTag.md)
   - [Добавление параметров диагностике](DiagnostcAddSettings.md)

From eba28e7b88d4055bdab40281197d14882736679e Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Mon, 13 Apr 2020 15:27:28 +0300
Subject: [PATCH 039/444] =?UTF-8?q?Another=20fix=20fp=20=D0=B7=D0=B0=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=81=20=D0=B2=20=D1=86=D0=B8=D0=BA=D0=BB=D0=B5=20?=
 =?UTF-8?q?#1046?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateQueryInCycleDiagnostic.java         | 28 ++++++++++++++++---
 .../CreateQueryInCycleDiagnosticTest.java     |  6 ++--
 .../CreateQueryInCycleDiagnostic.bsl          | 20 +++++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
index 7b0a2a1c53f..a187494e908 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
@@ -35,6 +35,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.ArrayDeque;
+import java.util.Collection;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -274,10 +275,20 @@ public ParseTree visitAccessCall(BSLParser.AccessCallContext ctx) {
 
   @Override
   public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
+    boolean alreadyInCycle = currentScope.codeFlowInCycle();
+    ParseTree result;
     currentScope.flowMode.push(CodeFlowType.CYCLE);
-    ParseTree result = super.visitForEachStatement(ctx);
+    if(alreadyInCycle) {
+      Optional.ofNullable(ctx.expression())
+        .ifPresent( e -> e.accept(this));
+    }
+    Optional.ofNullable(ctx.codeBlock())
+      .map(e -> e.children)
+      .stream().
+      flatMap(Collection::stream)
+      .forEach( t -> t.accept(this));
     currentScope.flowMode.pop();
-    return result;
+    return null;
   }
 
   @Override
@@ -290,10 +301,19 @@ public ParseTree visitWhileStatement(BSLParser.WhileStatementContext ctx) {
 
   @Override
   public ParseTree visitForStatement(BSLParser.ForStatementContext ctx) {
+    boolean alreadyInCycle = currentScope.codeFlowInCycle();
     currentScope.flowMode.push(CodeFlowType.CYCLE);
-    ParseTree result = super.visitForStatement(ctx);
+    if(alreadyInCycle) {
+      ctx.expression()
+        .forEach( e-> e.accept(this));
+    }
+    Optional.ofNullable(ctx.codeBlock())
+      .map(e -> e.children)
+      .stream()
+      .flatMap(Collection::stream)
+      .forEach( t -> t.accept(this));
     currentScope.flowMode.pop();
-    return result;
+    return null;
   }
 
   public enum CodeFlowType {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnosticTest.java
index 9bc96f39dfa..81e82a4be88 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnosticTest.java
@@ -39,7 +39,7 @@ class CreateQueryInCycleDiagnosticTest extends AbstractDiagnosticTest<CreateQuer
   void test() {
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(8);
+    assertThat(diagnostics).hasSize(10);
     assertThat(diagnostics, true)
       .hasRange(4, 8, 4, 36)
       .hasRange(27, 23, 27, 47)
@@ -48,6 +48,8 @@ void test() {
       .hasRange(59, 4, 59, 18)
       .hasRange(60, 4, 60, 24)
       .hasRange(66, 4, 66, 22)
-      .hasRange(73, 2, 73, 30);
+      .hasRange(73, 2, 73, 30)
+      .hasRange(79, 4, 79, 34)
+      .hasRange(90, 41, 90, 71);
   }
 }
diff --git a/src/test/resources/diagnostics/CreateQueryInCycleDiagnostic.bsl b/src/test/resources/diagnostics/CreateQueryInCycleDiagnostic.bsl
index e2024cdfea7..fd524b44328 100644
--- a/src/test/resources/diagnostics/CreateQueryInCycleDiagnostic.bsl
+++ b/src/test/resources/diagnostics/CreateQueryInCycleDiagnostic.bsl
@@ -74,3 +74,23 @@
   Запрос.Выполнить().Выбрать();
 
 КонецЦикла;
+
+Для Каждого СтрокаПредопределенного Из Коллекция Цикл
+
+    Запрос.Выполнить().Выгрузить();
+
+КонецЦикла;
+
+Для Каждого СтрокаПредопределенного Из Запрос.Выполнить().Выгрузить() Цикл
+
+
+КонецЦикла;
+
+Для ит = 1 По 10 Цикл
+
+  Для Каждого СтрокаПредопределенного Из Запрос.Выполнить().Выгрузить() Цикл // Тут
+
+
+  КонецЦикла;
+
+КонецЦикла;
\ No newline at end of file

From 14af3296365e052c1ebb9cab054e37c814cad5d1 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Mon, 13 Apr 2020 17:18:05 +0300
Subject: [PATCH 040/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20VariableSymbol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/VariableSymbolComputer.java      | 17 ++++-
 .../context/computer/VariableSymbolTest.java  | 72 ++++++++++++++++---
 .../symbol/variableSymbolTest.bsl}            |  9 ++-
 3 files changed, 86 insertions(+), 12 deletions(-)
 rename src/test/resources/{providers/variableSymbol.bsl => context/symbol/variableSymbolTest.bsl} (64%)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
index b668f25d21f..31cf93690c2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
@@ -32,6 +32,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.eclipse.lsp4j.Range;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -103,8 +104,10 @@ private Optional<VariableDescription> createDescription(Token token) {
         .build()
       );
 
-    var description = VariableDescription.builder()
+    var description =
+    VariableDescription.builder()
       .description(commentsText)
+      .range(getRangeForDescription(comments))
       .trailingDescription(trailingDescription)
       .build();
 
@@ -119,4 +122,16 @@ private static Token getTokenToSearchComments(BSLParserRuleContext declaration)
     return parent.getStart();
   }
 
+  private static Range getRangeForDescription(List<Token> tokens) {
+
+    if (tokens.isEmpty()) {
+      return null;
+    }
+
+    Token firstElement = tokens.get(0);
+    Token lastElement = tokens.get(tokens.size() - 1);
+
+    return Ranges.create(firstElement, lastElement);
+  }
+
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
index 7d175562698..b2b3c662251 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
@@ -23,38 +23,90 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableDescription;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import org.eclipse.lsp4j.Range;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class VariableSymbolTest {
 
-  @Test
-  void testVariableDescription() {
+  static DocumentContext documentContext;
+  static List<VariableSymbol> variableSymbols;
+
+  static {
+    documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/symbol/variableSymbolTest.bsl");
+    variableSymbols = documentContext.getSymbolTree().getVariables();
+  }
 
-    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/providers/variableSymbol.bsl");
-    List<VariableSymbol> variableSymbols = documentContext.getSymbolTree().getVariables();
+  @Test
+  void testVariableSymbolDescription() {
 
-    assertThat(variableSymbols).hasSize(4);
+    assertThat(variableSymbols).hasSize(7);
 
     assertThat(variableSymbols)
       .filteredOn(variableSymbol -> variableSymbol.getDescription().isEmpty())
-      .hasSize(2)
-      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(1, 6, 1, 27)))
-      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(10, 6, 10, 34)))
+      .hasSize(4)
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(12, 6, 12, 34)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(14, 6, 14, 27)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(16, 6, 16, 17)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(16, 19, 16, 30)))
     ;
 
     assertThat(variableSymbols)
       .filteredOn(variableSymbol -> variableSymbol.getDescription().isPresent())
+      .hasSize(3)
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(2, 6, 2, 32)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(6, 6, 6, 32)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(8, 6, 8, 33)))
+    ;
+
+  }
+
+  @Test
+  void testVariableDescriptionRange() {
+
+    List<VariableDescription> variableDescriptions = variableSymbols.stream()
+      .map(VariableSymbol::getDescription)
+      .filter(Optional::isPresent)
+      .map(Optional::get)
+      .collect(Collectors.toList());
+
+    assertThat(variableDescriptions).hasSize(3);
+
+    assertThat(variableDescriptions)
+      .filteredOn(variableDescription -> !variableDescription.getDescription().equals(""))
       .hasSize(2)
-      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(4, 6, 4, 32)))
-      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(6, 6, 6, 33)))
+      .anyMatch(variableDescription -> variableDescription.getRange().equals(Ranges.create(1, 0, 1, 18)))
+      .anyMatch(variableDescription -> variableDescription.getRange().equals(Ranges.create(4, 0, 5, 23)))
+    ;
+
+    assertThat(variableDescriptions)
+      .extracting(VariableDescription::getTrailingDescription)
+      .filteredOn(Optional::isPresent)
+      .hasSize(1)
+      .extracting(Optional::get)
+      .anyMatch(trailingDescription -> trailingDescription.getRange().equals(Ranges.create(8, 35, 8, 55)))
     ;
 
   }
 
+  @Test
+  void testVariableNameRange() {
+
+    assertThat(variableSymbols)
+      .filteredOn(variableSymbol -> variableSymbol.getDescription().isEmpty())
+      .hasSize(4)
+      .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(12, 6, 12, 34)))
+      .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(14, 6, 14, 27)))
+      .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(16, 6, 16, 17)))
+      .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(16, 19, 16, 30)))
+    ;
+  }
 }
diff --git a/src/test/resources/providers/variableSymbol.bsl b/src/test/resources/context/symbol/variableSymbolTest.bsl
similarity index 64%
rename from src/test/resources/providers/variableSymbol.bsl
rename to src/test/resources/context/symbol/variableSymbolTest.bsl
index 134fe908fcf..5930a0769ad 100644
--- a/src/test/resources/providers/variableSymbol.bsl
+++ b/src/test/resources/context/symbol/variableSymbolTest.bsl
@@ -1,7 +1,9 @@
 
-Перем ПеременнаяБезОписания;
+// Описание сверху
+Перем ПеременнаяСОписаниемСверху;
 
 // Описание сверху
+// Еще немного описания
 Перем ПеременнаяСОписаниемСверху;
 
 Перем ПеременнаяСОписаниемВСтроке; // Описание в строке
@@ -9,3 +11,8 @@
 // Неверное описание
 
 Перем ПеременнаяСНевернымОписанием;
+
+Перем ПеременнаяБезОписания;
+
+Перем ПеременнаяА, ПеременнаяБ;
+

From e3b0a0ca78811540e9991f9a82574f033436dfe1 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 19:18:01 +0300
Subject: [PATCH 041/444] =?UTF-8?q?MethodeSymbolComputer=20subName=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=A1=D1=82=D0=B0=D1=80=D1=82=D0=A2=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/MethodSymbolComputer.java        |  6 +-
 .../computer/MethodSymbolComputerTest.java    | 71 +++++++++++++++++++
 .../computer/MethodSymbolComputerTest.bsl     | 19 +++++
 .../MethodSymbolComputerTestParseError.bsl    |  3 +
 4 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
 create mode 100644 src/test/resources/context/computer/MethodSymbolComputerTest.bsl
 create mode 100644 src/test/resources/context/computer/MethodSymbolComputerTestParseError.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index b90fd7c323f..9561f672a90 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -77,7 +77,7 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
     MethodSymbol methodSymbol = createMethodSymbol(
       startNode,
       stopNode,
-      declaration.subName(),
+      declaration.subName().getStart(),
       declaration.paramList(),
       true,
       declaration.EXPORT_KEYWORD() != null
@@ -106,7 +106,7 @@ public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
     MethodSymbol methodSymbol = createMethodSymbol(
       startNode,
       stopNode,
-      declaration.subName(),
+      declaration.subName().getStart(),
       declaration.paramList(),
       false,
       declaration.EXPORT_KEYWORD() != null
@@ -120,7 +120,7 @@ public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
   private MethodSymbol createMethodSymbol(
     TerminalNode startNode,
     TerminalNode stopNode,
-    BSLParser.SubNameContext subName,
+    Token subName,
     BSLParser.ParamListContext paramList,
     boolean function,
     boolean export
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
new file mode 100644
index 00000000000..9ef91b6c3d0
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -0,0 +1,71 @@
+package com.github._1c_syntax.bsl.languageserver.context.computer;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.ParameterDefinition;
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MethodSymbolComputerTest {
+
+  @Test
+  void testMethodSymbolComputer() {
+
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/computer/MethodSymbolComputerTest.bsl");
+    List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
+
+    assertThat(methods.size()).isEqualTo(3);
+
+    assertThat(methods.get(0).getName()).isEqualTo("Один");
+    assertThat(methods.get(0).getDescription().orElse(null)).isNull();
+    assertThat(methods.get(0).getRange()).isEqualTo(Ranges.create(1, 0, 3, 14));
+    assertThat(methods.get(0).getSubNameRange()).isEqualTo(Ranges.create(1, 10, 1, 14));
+
+    assertThat(methods.get(1).getDescription()).isNotEmpty();
+    assertThat(methods.get(1).getRegion().orElse(null).getName()).isEqualTo("ИмяОбласти");
+    assertThat(methods.get(1).getDescription().orElse(null).getDescription()).isNotEmpty();
+
+  }
+
+  @Test
+  void testParameters() {
+
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/computer/MethodSymbolComputerTest.bsl");
+    List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
+
+    List<ParameterDefinition> parameters = methods.get(2).getParameters();
+    assertThat(parameters.size()).isEqualTo(4);
+    assertThat(parameters.get(0).getName()).isEqualTo("Парам");
+    assertThat(parameters.get(0).isByValue()).isFalse();
+    assertThat(parameters.get(0).isOptional()).isFalse();
+
+    assertThat(parameters.get(1).getName()).isEqualTo("Парам2");
+    assertThat(parameters.get(1).isByValue()).isTrue();
+    assertThat(parameters.get(1).isOptional()).isFalse();
+
+    assertThat(parameters.get(2).getName()).isEqualTo("Парам3");
+    assertThat(parameters.get(2).isByValue()).isFalse();
+    assertThat(parameters.get(2).isOptional()).isTrue();
+
+    assertThat(parameters.get(3).getName()).isEqualTo("Парам4");
+    assertThat(parameters.get(3).isByValue()).isTrue();
+    assertThat(parameters.get(3).isOptional()).isTrue();
+
+  }
+
+  @Test
+  void testParseError() {
+
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/computer/MethodSymbolComputerTestParseError.bsl");
+    List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
+
+    assertThat(methods.get(0).getName()).isEqualTo("Выполнить");
+    assertThat(methods.get(0).getSubNameRange()).isEqualTo(Ranges.create(0, 10, 0, 19));
+
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/context/computer/MethodSymbolComputerTest.bsl b/src/test/resources/context/computer/MethodSymbolComputerTest.bsl
new file mode 100644
index 00000000000..373be805b44
--- /dev/null
+++ b/src/test/resources/context/computer/MethodSymbolComputerTest.bsl
@@ -0,0 +1,19 @@
+
+Процедура Один()
+    А = 0;
+КонецПроцедуры
+
+#Область ИмяОбласти
+
+// Описание
+// Возвращаемое значение:
+// Строка - описание строки
+Функция Два()
+    Возврат Неопределено;
+КонецФункции
+
+Функция Три(Парам, Знач Парам2, Парам3 = 0, Знач Парам4 = 0)
+    Возврат Неопределено;
+КонецФункции
+
+#КонецОбласти
diff --git a/src/test/resources/context/computer/MethodSymbolComputerTestParseError.bsl b/src/test/resources/context/computer/MethodSymbolComputerTestParseError.bsl
new file mode 100644
index 00000000000..e055cf6852d
--- /dev/null
+++ b/src/test/resources/context/computer/MethodSymbolComputerTestParseError.bsl
@@ -0,0 +1,3 @@
+Процедура Выполнить()
+
+КонецПроцедуры

From 81d047c93272caa9fa399cffb0065a660b3803f9 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 19:19:12 +0300
Subject: [PATCH 042/444] CodeOutOfRegion test

---
 .../diagnostics/CodeOutOfRegionDiagnosticTest.java    | 11 +++++++++++
 .../diagnostics/CodeOutOfRegionDiagnosticExecute.bsl  |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/test/resources/diagnostics/CodeOutOfRegionDiagnosticExecute.bsl

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java
index 70b8f0168a1..4e09de3708a 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnosticTest.java
@@ -96,4 +96,15 @@ void testEmptyFile() {
 
   }
 
+  @Test
+  void testExecute() {
+
+    List<Diagnostic> diagnostics = getDiagnostics("CodeOutOfRegionDiagnosticExecute");
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(1, 10, 1, 19);
+
+  }
+
 }
diff --git a/src/test/resources/diagnostics/CodeOutOfRegionDiagnosticExecute.bsl b/src/test/resources/diagnostics/CodeOutOfRegionDiagnosticExecute.bsl
new file mode 100644
index 00000000000..76871b83e20
--- /dev/null
+++ b/src/test/resources/diagnostics/CodeOutOfRegionDiagnosticExecute.bsl
@@ -0,0 +1,4 @@
+
+Процедура Выполнить()
+
+КонецПроцедуры

From 539368fc50d887bd371bc8879c2639ec7cf9d391 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 20:02:57 +0300
Subject: [PATCH 043/444] liicense add

---
 .../computer/MethodSymbolComputerTest.java    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index 9ef91b6c3d0..b4e10b4674d 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.context.computer;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;

From ec2f280aa355a6a6ebb89f02a11d7aff774b94b8 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 20:25:06 +0300
Subject: [PATCH 044/444] Update
 src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java

---
 .../context/computer/MethodSymbolComputerTest.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index b4e10b4674d..1c4a6d36fa4 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -89,4 +89,4 @@ void testParseError() {
     assertThat(methods.get(0).getSubNameRange()).isEqualTo(Ranges.create(0, 10, 0, 19));
 
   }
-}
\ No newline at end of file
+}

From c66dd4b5d9b898f49a02b1ce3cced159803b9572 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 21:56:39 +0300
Subject: [PATCH 045/444] ContentList with last whiteSpaces

---
 .../bsl/languageserver/context/DocumentContext.java   |  2 +-
 .../languageserver/context/DocumentContextTest.java   | 11 +++++++++++
 src/test/resources/context/DocumentContextTest.bsl    |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index 3b9fa8c6823..9a985ae7912 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -234,7 +234,7 @@ private static FileType computeFileType(URI uri) {
   }
 
   private String[] computeContentList() {
-    return getContent().split("\n");
+    return getContent().split("\n", -1);
   }
 
   private SymbolTree computeSymbolTree() {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
index bae3d5373f8..c3703e5de9c 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
@@ -208,5 +208,16 @@ void testComputeMetricsComments() {
 
   }
 
+  @Test
+  void testContentList() {
+    // given
+    DocumentContext documentContext = getDocumentContext();
+
+    // when
+    String[] conten = documentContext.getContentList();
+
+    // then
+    assertThat(conten.length).isEqualTo(40);
+  }
 
 }
\ No newline at end of file
diff --git a/src/test/resources/context/DocumentContextTest.bsl b/src/test/resources/context/DocumentContextTest.bsl
index f6c9e8f83e5..ff49137ad7d 100644
--- a/src/test/resources/context/DocumentContextTest.bsl
+++ b/src/test/resources/context/DocumentContextTest.bsl
@@ -34,3 +34,6 @@
 Функция ФункцияСПараметрами(Парам1, Знач Парам2, Парам3 = 0, Знач Парам4 = 0)
 
 КонецФункции
+
+
+

From 27f87f62021a508b57f1799b2e5a058118fe22ad Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 22:11:40 +0300
Subject: [PATCH 046/444] test fix

---
 .../bsl/languageserver/context/DocumentContextTest.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
index c3703e5de9c..648a11eb1b7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
@@ -214,10 +214,10 @@ void testContentList() {
     DocumentContext documentContext = getDocumentContext();
 
     // when
-    String[] conten = documentContext.getContentList();
+    String[] contentList = documentContext.getContentList();
 
     // then
-    assertThat(conten.length).isEqualTo(40);
+    assertThat(contentList).hasSize(40);
   }
 
 }
\ No newline at end of file

From fcc5df8b3b47be2ba4f2a4d5ec0dc14572e66ca5 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 13 Apr 2020 22:54:27 +0300
Subject: [PATCH 047/444] CodeActionAssert fix

---
 .../bsl/languageserver/util/assertions/CodeActionAssert.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/assertions/CodeActionAssert.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/assertions/CodeActionAssert.java
index d3878d679fd..5f17c89fba4 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/assertions/CodeActionAssert.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/assertions/CodeActionAssert.java
@@ -35,6 +35,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import static java.lang.Integer.max;
+
 public class CodeActionAssert extends AbstractAssert<CodeActionAssert, CodeAction> {
 
   private DocumentContext documentContext;
@@ -88,7 +90,7 @@ public CodeActionAssert fixes(Diagnostic diagnostic) {
       startLine = end.getLine();
       startChar = end.getCharacter();
       endLine = contentList.length - 1;
-      endChar = contentList[endLine].length() - 1;
+      endChar = max(contentList[endLine].length() - 1, 0);
 
       Range endRange = Ranges.create(startLine, startChar, endLine, endChar);
       final String endText = documentContext.getText(endRange);

From 346fe69bd5075af0b99a2c32e257fe7a1c16b5b9 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 14 Apr 2020 06:48:01 +0300
Subject: [PATCH 048/444] Cleanup code, remove doubles.

---
 .../CreateQueryInCycleDiagnostic.java         | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
index a187494e908..06ff11b434a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
@@ -236,6 +236,14 @@ private Set<String> getTypesFromComplexIdentifier(BSLParser.ComplexIdentifierCon
     }
   }
 
+  private void visitDescendantCodeBlock(BSLParser.CodeBlockContext ctx){
+    Optional.ofNullable(ctx)
+      .map(e -> e.children)
+      .stream()
+      .flatMap(Collection::stream)
+      .forEach( t -> t.accept(this));
+  }
+
   @Override
   public ParseTree visitAccessCall(BSLParser.AccessCallContext ctx) {
     if (!EXECUTE_CALL_PATTERN.matcher(ctx.methodCall().methodName().getText()).matches()) {
@@ -276,17 +284,12 @@ public ParseTree visitAccessCall(BSLParser.AccessCallContext ctx) {
   @Override
   public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
     boolean alreadyInCycle = currentScope.codeFlowInCycle();
-    ParseTree result;
     currentScope.flowMode.push(CodeFlowType.CYCLE);
     if(alreadyInCycle) {
       Optional.ofNullable(ctx.expression())
         .ifPresent( e -> e.accept(this));
     }
-    Optional.ofNullable(ctx.codeBlock())
-      .map(e -> e.children)
-      .stream().
-      flatMap(Collection::stream)
-      .forEach( t -> t.accept(this));
+    visitDescendantCodeBlock(ctx.codeBlock());
     currentScope.flowMode.pop();
     return null;
   }
@@ -307,11 +310,7 @@ public ParseTree visitForStatement(BSLParser.ForStatementContext ctx) {
       ctx.expression()
         .forEach( e-> e.accept(this));
     }
-    Optional.ofNullable(ctx.codeBlock())
-      .map(e -> e.children)
-      .stream()
-      .flatMap(Collection::stream)
-      .forEach( t -> t.accept(this));
+    visitDescendantCodeBlock(ctx.codeBlock());
     currentScope.flowMode.pop();
     return null;
   }

From 6a9edd24f5b13066a26c2eafc12b9d9b6e2d4260 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 14 Apr 2020 06:52:53 +0300
Subject: [PATCH 049/444] return context

---
 .../diagnostics/CreateQueryInCycleDiagnostic.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
index 06ff11b434a..7aa5f8f96a1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
@@ -291,7 +291,7 @@ public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
     }
     visitDescendantCodeBlock(ctx.codeBlock());
     currentScope.flowMode.pop();
-    return null;
+    return ctx;
   }
 
   @Override
@@ -312,7 +312,7 @@ public ParseTree visitForStatement(BSLParser.ForStatementContext ctx) {
     }
     visitDescendantCodeBlock(ctx.codeBlock());
     currentScope.flowMode.pop();
-    return null;
+    return ctx;
   }
 
   public enum CodeFlowType {

From 02b3f0a4c6aea7f7b0b434b576274303177c38a9 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Tue, 14 Apr 2020 11:02:41 +0300
Subject: [PATCH 050/444] =?UTF-8?q?=D0=BA=D1=82=D0=BE-=D1=82=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20precommit?=
 =?UTF-8?q?=20-=20=D1=82.=D0=BA.=20=D0=BF=D1=80=D0=B8=20=D0=B5=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D1=83=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/diagnostics/MethodSize.md                             | 2 +-
 docs/en/diagnostics/index.md                                  | 2 +-
 .../bsl/languageserver/configuration/diagnostics-schema.json  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/diagnostics/MethodSize.md b/docs/en/diagnostics/MethodSize.md
index e3f6095d305..33027e71da9 100644
--- a/docs/en/diagnostics/MethodSize.md
+++ b/docs/en/diagnostics/MethodSize.md
@@ -1,4 +1,4 @@
-# Method size  (MethodSize)
+# Method size (MethodSize)
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 246b94d7e89..541b675e17d 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -50,7 +50,7 @@ Total: **87**
 | [InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br/>`standard`<br/>`unpredictable` |
 | [LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` |
-| [MethodSize](MethodSize.md) | Method size  | Yes | Major | Code smell | `badpractice` |
+| [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`<br/>`badpractice` |
 | [MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice` |
 | [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br/>`standard` |
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index e50e2182208..2fce47dae7d 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -409,13 +409,13 @@
             "$id": "#/definitions/MagicNumber"
         },
         "MethodSize": {
-            "description": "Method size ",
+            "description": "Method size",
             "default": null,
             "type": [
                 "boolean",
                 "object"
             ],
-            "title": "Method size ",
+            "title": "Method size",
             "properties": {
                 "maxMethodSize": {
                     "description": "Max method line count.",

From bf03f7d9fe23c488fd63eb49fae44e2e6924b8f5 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 14 Apr 2020 15:14:36 +0300
Subject: [PATCH 051/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D1=83=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=B1=D0=B5=D0=BD=D1=87=D0=BC=D0=B0=D1=80=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f63eb6fdc0c..ed3f50246d0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 Сайт проекта - https://1c-syntax.github.io/bsl-language-server
 
-Замеры производительности - [SSL 3.1](https://1c-syntax.github.io/bsl-language-serve/bench/index.html)
+Замеры производительности - [SSL 3.1](https://1c-syntax.github.io/bsl-language-server/dev/bench/index.html)
 
 [English version](docs/en/index.md)
 

From 6de0173294d9f212160881706c84abcfe1bdd4c6 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 14 Apr 2020 21:29:47 +0300
Subject: [PATCH 052/444] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D1=81=D0=B5=D1=80=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B0=D0=B5=D1=82=20EOF=20=D0=B2=20Hidden=20?=
 =?UTF-8?q?Channel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                              | 2 +-
 .../bsl/languageserver/context/DocumentContextTest.java       | 4 ++--
 src/test/resources/providers/format_formatted.bsl             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ebceff53a86..80f686f8f9e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "0.13.0") {
+    implementation("com.github.1c-syntax", "bsl-parser", "01cc1512e10b667a0ec3fdd2307ca0221bf52684") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
index 648a11eb1b7..5ce1568ea86 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
@@ -43,12 +43,12 @@ class DocumentContextTest {
   void testRebuild() throws IOException {
 
     DocumentContext documentContext = getDocumentContext("./src/test/resources/context/DocumentContextRebuildFirstTest.bsl");
-    assertThat(documentContext.getTokens()).hasSize(38);
+    assertThat(documentContext.getTokens()).hasSize(39);
 
     File file = new File("./src/test/resources/context/DocumentContextRebuildSecondTest.bsl");
     String fileContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
     documentContext.rebuild(fileContent);
-    assertThat(documentContext.getTokens()).hasSize(15);
+    assertThat(documentContext.getTokens()).hasSize(16);
   }
 
   @Test
diff --git a/src/test/resources/providers/format_formatted.bsl b/src/test/resources/providers/format_formatted.bsl
index eadca82d3ea..27cb8a69477 100644
--- a/src/test/resources/providers/format_formatted.bsl
+++ b/src/test/resources/providers/format_formatted.bsl
@@ -30,4 +30,4 @@
 Процедура Третья()
     // Комментарий с пробелами слева
     // Другой комментарий с пробелами
-КонецПроцедуры
+КонецПроцедуры
\ No newline at end of file

From 197f05077953508b963d16b30e92785400c7c39f Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 14 Apr 2020 21:51:27 +0300
Subject: [PATCH 053/444] EOF test

---
 .../context/DocumentContextTest.java          | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
index 5ce1568ea86..30973fbd1f7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContextTest.java
@@ -25,6 +25,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import lombok.SneakyThrows;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Token;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.jupiter.api.Test;
@@ -82,8 +84,8 @@ void testMethodParametersComputesCorrectly() {
       .hasSize(4)
       .anyMatch(parameterDefinition ->
         parameterDefinition.getName().equals("Парам1")
-        && !parameterDefinition.isByValue()
-        && !parameterDefinition.isOptional()
+          && !parameterDefinition.isByValue()
+          && !parameterDefinition.isOptional()
       )
       .anyMatch(parameterDefinition ->
         parameterDefinition.getName().equals("Парам2")
@@ -220,4 +222,15 @@ void testContentList() {
     assertThat(contentList).hasSize(40);
   }
 
-}
\ No newline at end of file
+  @Test
+  void testEOF() {
+    // given
+    DocumentContext documentContext = getDocumentContext();
+    // when
+    List<Token> tokens = documentContext.getTokens();
+    Token lastToken = tokens.get(tokens.size() - 1);
+    // then
+    assertThat(lastToken.getType()).isEqualTo(Lexer.EOF);
+    assertThat(lastToken.getChannel()).isEqualTo(Lexer.HIDDEN);
+  }
+}

From e93883c94bac1affb541e89a15176d1645a9ad7c Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 15 Apr 2020 10:30:43 +0300
Subject: [PATCH 054/444] parser version bump

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 80f686f8f9e..6b44f06a1ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "01cc1512e10b667a0ec3fdd2307ca0221bf52684") {
+    implementation("com.github.1c-syntax", "bsl-parser", "0.14.0") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")

From 027f82941995df3fa75af3b0a7f76c4c5f143237 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 15 Apr 2020 15:12:40 +0300
Subject: [PATCH 055/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BB=D0=B8=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLSPLauncher.java    |  8 ++++
 .../languageserver/cli/AnalyzeCommand.java    | 19 +++++++---
 .../bsl/languageserver/cli/FormatCommand.java | 20 ++++++----
 .../languageserver/BSLLSPLauncherTest.java    | 38 +++++++++++++++++++
 4 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index ec17fdea384..9b53f8192f7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -132,11 +132,19 @@ public static Options createOptions() {
       "Show version."
     );
 
+    Option silentMode = new Option(
+      "S",
+      "silent",
+      false,
+      "Silent mode"
+    );
+
     createdOptions.addOption(analyze);
     createdOptions.addOption(format);
     createdOptions.addOption(srcDir);
     createdOptions.addOption(outputDir);
     createdOptions.addOption(reporter);
+    createdOptions.addOption(silentMode);
 
     createdOptions.addOption(configurationOption);
     createdOptions.addOption(help);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index d59471edc28..675837c73cf 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -61,7 +61,7 @@
  *  -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то будут использованы настройки по умолчанию.
- * -r, (--reporter) &lt;arg&gt; -       Ключи "Репортеров", т.е. форматов отчетов, котрые необходимо сгенерировать после
+ *  -r, (--reporter) &lt;arg&gt; -      Ключи "Репортеров", т.е. форматов отчетов, котрые необходимо сгенерировать после
  *                                выполнения анализа. Может быть указано более одного ключа. Если параметр опущен,
  *                                то вывод результата будет призведен в консоль.
  * Выводимая информация:
@@ -83,6 +83,7 @@ public int execute() {
     String srcDirOption = cmd.getOptionValue("srcDir", "");
     String outputDirOption = cmd.getOptionValue("outputDir", "");
     String configurationOption = cmd.getOptionValue("configuration", "");
+    boolean silentMode = cmd.hasOption("silent");
 
     Path srcDir = Absolute.path(srcDirOption);
     File configurationFile = new File(configurationOption);
@@ -97,13 +98,19 @@ public int execute() {
     Collection<File> files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
 
     List<FileInfo> fileInfos;
-    try (ProgressBar pb = new ProgressBar("Analyzing files...", files.size(), ProgressBarStyle.ASCII)) {
+    if (silentMode) {
       fileInfos = files.parallelStream()
-        .map((File file) -> {
-          pb.step();
-          return getFileInfoFromFile(srcDir, file);
-        })
+        .map((File file) -> getFileInfoFromFile(srcDir, file))
         .collect(Collectors.toList());
+    } else {
+      try (ProgressBar pb = new ProgressBar("Analyzing files...", files.size(), ProgressBarStyle.ASCII)) {
+        fileInfos = files.parallelStream()
+          .map((File file) -> {
+            pb.step();
+            return getFileInfoFromFile(srcDir, file);
+          })
+          .collect(Collectors.toList());
+      }
     }
 
     AnalysisInfo analysisInfo = new AnalysisInfo(LocalDateTime.now(), fileInfos, srcDirOption);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index a622840df1d..841882699c5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -46,13 +46,12 @@
  * Ключ команды:
  *  -f, (--format)
  * Параметры:
- *  -s, (--srcDir) &lt;arg&gt; -        Путь к каталогу исходных файлов.
+ *  -s, (--srcDir) &lt;arg&gt; -  Путь к каталогу исходных файлов.
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то анализ выполняется в текущем каталоге запуска.
  * Выводимая информация:
  *  Выполняет форматирование исходного кода в файлах каталога. Для форматирования используются правила и настройки
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.
- *
  */
 public class FormatCommand implements Command {
 
@@ -69,17 +68,22 @@ public int execute() {
     serverContext.clear();
 
     String srcDirOption = cmd.getOptionValue("srcDir", "");
+    boolean silentMode = cmd.hasOption("silent");
 
     Path srcDir = Absolute.path(srcDirOption);
 
     Collection<File> files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
 
-    try (ProgressBar pb = new ProgressBar("Formatting files...", files.size(), ProgressBarStyle.ASCII)) {
-      files.parallelStream()
-        .forEach((File file) -> {
-          pb.step();
-          formatFile(file);
-        });
+    if (silentMode) {
+      files.parallelStream().forEach(this::formatFile);
+    } else {
+      try (ProgressBar pb = new ProgressBar("Formatting files...", files.size(), ProgressBarStyle.ASCII)) {
+        files.parallelStream()
+          .forEach((File file) -> {
+            pb.step();
+            formatFile(file);
+          });
+      }
     }
 
     return 0;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 7d0a3208d61..7c4c26930b0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -105,6 +105,25 @@ void testAnalyze() {
     // assertThat(errContent.toString()).contains("100%");
   }
 
+  @Test
+  @ExpectSystemExitWithStatus(0)
+  void testAnalyzeSilent() {
+    // given
+    String[] args = new String[]{"--analyze", "--srcDir", "./src/test/resources/cli", "-S"};
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).isEmpty();
+  }
+
   @Test
   @ExpectSystemExitWithStatus(0)
   void testFormat() {
@@ -125,6 +144,25 @@ void testFormat() {
     // assertThat(errContent.toString()).contains("100%");
   }
 
+  @Test
+  @ExpectSystemExitWithStatus(0)
+  void testFormatSilent() {
+    // given
+    String[] args = new String[]{"--format", "--srcDir", "./src/test/resources/cli", "-S"};
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).isEmpty();
+  }
+
   @Test
   void testWithoutParameters() {
     // given

From dca59ba0fb7971c8ad6da41cf05797903f89ea9c Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 15 Apr 2020 16:20:24 +0300
Subject: [PATCH 056/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=D0=BD=D0=BD=D1=83?=
 =?UTF-8?q?=D1=8E=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                        | 1 +
 docs/en/index.md                                                 | 1 +
 docs/index.md                                                    | 1 +
 .../github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java | 1 +
 .../github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index ed3f50246d0..e605babc234 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
+ -S,--silent                Silent mode
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP](https://microsoft.github.io/language-server-protocol/). Для взаимодействия используются stdin и stdout.
diff --git a/docs/en/index.md b/docs/en/index.md
index e1bdd5980f4..ea813b5468c 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -58,6 +58,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
+ -S,--silent                Silent mode
 ```
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
diff --git a/docs/index.md b/docs/index.md
index 224a4ceb131..cd6be8638e3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -58,6 +58,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
+ -S,--silent                Silent mode
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 675837c73cf..5de9afbb83d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -64,6 +64,7 @@
  *  -r, (--reporter) &lt;arg&gt; -      Ключи "Репортеров", т.е. форматов отчетов, котрые необходимо сгенерировать после
  *                                выполнения анализа. Может быть указано более одного ключа. Если параметр опущен,
  *                                то вывод результата будет призведен в консоль.
+ *  -S, (--silent)              -       Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
  * Выводимая информация:
  *  Выполняет анализ каталога исходных файлов и генерацию файлов отчета. Для каждого указанного ключа "Репортера"
  *  создается отдельный файл (каталог файлов). Реализованные "репортеры" находятся в пакете "reporter".
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index 841882699c5..74cf9df03b1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -49,6 +49,7 @@
  *  -s, (--srcDir) &lt;arg&gt; -  Путь к каталогу исходных файлов.
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то анализ выполняется в текущем каталоге запуска.
+ *  -S, (--silent)             -  Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
  * Выводимая информация:
  *  Выполняет форматирование исходного кода в файлах каталога. Для форматирования используются правила и настройки
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.

From 457a0eeb84b10d078df92a20035702474ec89034 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 15 Apr 2020 16:23:54 +0300
Subject: [PATCH 057/444] thisObjectAssignDiagnostic

---
 docs/diagnostics/ThisObjectAssign.md          |  40 ++++++
 docs/diagnostics/index.md                     |   5 +-
 docs/en/diagnostics/ThisObjectAssign.md       |  36 ++++++
 docs/en/diagnostics/index.md                  |   5 +-
 .../ThisObjectAssignDiagnostic.java           |  82 +++++++++++++
 .../configuration/diagnostics-schema.json     |  10 ++
 .../languageserver/configuration/schema.json  |   3 +
 .../ThisObjectAssignDiagnostic_en.properties  |   2 +
 .../ThisObjectAssignDiagnostic_ru.properties  |   2 +
 .../ThisObjectAssignDiagnosticTest.java       | 114 ++++++++++++++++++
 .../ThisObjectAssignDiagnostic.bsl            |   5 +
 11 files changed, 300 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/ThisObjectAssign.md
 create mode 100644 docs/en/diagnostics/ThisObjectAssign.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/ThisObjectAssignDiagnostic.bsl

diff --git a/docs/diagnostics/ThisObjectAssign.md b/docs/diagnostics/ThisObjectAssign.md
new file mode 100644
index 00000000000..98812324feb
--- /dev/null
+++ b/docs/diagnostics/ThisObjectAssign.md
@@ -0,0 +1,40 @@
+# Присвоение заначения свойству ЭтотОбъект (ThisObjectAssign)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL` | `Блокирующий` | `Да` | `1` | `error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+В модулях управляемых форм и общих модулях не должно быть переменной с именем "ЭтотОбъект".
+
+Часто ошибка появляется при поднятии версии режима совместимости конфигурации т.к. в версиях до 8.3.3 
+свойство "ЭтотОбъект" у управляемых форм и общих модулей отсутствовало. И могло быть 
+использовано как переменная.
+
+## Примеры
+
+Неправильно:
+```bsl
+
+ЭтотОбъект = РеквизитФормыВЗначение("Объект");
+
+```
+
+## Источники
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:ThisObjectAssign-off
+// BSLLS:ThisObjectAssign-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"ThisObjectAssign": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 53ae4ea5032..d1eccfc2ac0 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **87**
+Общее количество: **88**
 
 * Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **28**
+* Ошибка: **29**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -80,6 +80,7 @@
 | [SpaceAtStartComment](SpaceAtStartComment.md) | Пробел в начале комментария | Да | Информационный | Дефект кода | `standard` |
 | [TempFilesDir](TempFilesDir.md) | Вызов функции КаталогВременныхФайлов() | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [TernaryOperatorUsage](TernaryOperatorUsage.md) | Использование тернарного оператора | Нет | Незначительный | Дефект кода | `brainoverload` |
+| [ThisObjectAssign](ThisObjectAssign.md) | Присвоение заначения свойству ЭтотОбъект | Да | Блокирующий | Ошибка | `error` |
 | [TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Таймауты при работе с внешними ресурсами | Да | Критичный | Ошибка | `unpredictable`<br/>`standard` |
 | [TooManyReturns](TooManyReturns.md) | Метод не должен содержать много возвратов | Нет | Незначительный | Дефект кода | `brainoverload` |
 | [TryNumber](TryNumber.md) | Приведение к числу в попытке | Да | Важный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/ThisObjectAssign.md b/docs/en/diagnostics/ThisObjectAssign.md
new file mode 100644
index 00000000000..fc8f4d6a83a
--- /dev/null
+++ b/docs/en/diagnostics/ThisObjectAssign.md
@@ -0,0 +1,36 @@
+# ThisObject assign (ThisObjectAssign)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:ThisObjectAssign-off
+// BSLLS:ThisObjectAssign-on
+```
+
+### Parameter for config
+
+```json
+"ThisObjectAssign": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 541b675e17d..92ef4e4c507 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **87**
+Total: **88**
 
-* Error: **28**
+* Error: **29**
 * Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
@@ -80,6 +80,7 @@ Total: **87**
 | [SpaceAtStartComment](SpaceAtStartComment.md) | Space at the beginning of the comment | Yes | Info | Code smell | `standard` |
 | [TempFilesDir](TempFilesDir.md) | TempFilesDir() method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [TernaryOperatorUsage](TernaryOperatorUsage.md) | Ternary operator usage | No | Minor | Code smell | `brainoverload` |
+| [ThisObjectAssign](ThisObjectAssign.md) | ThisObject assign | Yes | Blocker | Error | `error` |
 | [TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Timeouts working with external resources | Yes | Critical | Error | `unpredictable`<br/>`standard` |
 | [TooManyReturns](TooManyReturns.md) | Methods should not have too many return statements | No | Minor | Code smell | `brainoverload` |
 | [TryNumber](TryNumber.md) | Cast to number of try catch block | Yes | Major | Code smell | `standard` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
new file mode 100644
index 00000000000..83c03974bdd
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
@@ -0,0 +1,82 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
+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.DiagnosticScope;
+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.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.BLOCKER,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule,
+    ModuleType.FormModule
+  },
+  minutesToFix = 1,
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_3,
+  tags = {
+    DiagnosticTag.ERROR
+  }
+
+)
+public class ThisObjectAssignDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final Pattern thisObjectPattern = Pattern.compile(
+    "(этотобъект|thisobject)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public ThisObjectAssignDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitLValue(BSLParser.LValueContext ctx) {
+
+    TerminalNode identifier = ctx.IDENTIFIER();
+
+    if (identifier == null
+      || ctx.acceptor() != null) {
+      return ctx;
+    }
+
+    if (!thisObjectPattern.matcher(identifier.getText()).matches()) {
+      return ctx;
+    }
+
+    diagnosticStorage.addDiagnostic(identifier);
+
+    return ctx;
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 2fce47dae7d..3369ec036ca 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -828,6 +828,16 @@
             "title": "Ternary operator usage",
             "$id": "#/definitions/TernaryOperatorUsage"
         },
+        "ThisObjectAssign": {
+            "description": "ThisObject assign",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "ThisObject assign",
+            "$id": "#/definitions/ThisObjectAssign"
+        },
         "TimeoutsInExternalResources": {
             "description": "Timeouts working with external resources",
             "default": null,
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 f31df27a92d..c34797acb3e 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
@@ -290,6 +290,9 @@
                 "TernaryOperatorUsage": {
                     "$ref": "diagnostics-schema.json#/definitions/TernaryOperatorUsage"
                 },
+                "ThisObjectAssign": {
+                    "$ref": "diagnostics-schema.json#/definitions/ThisObjectAssign"
+                },
                 "TimeoutsInExternalResources": {
                     "$ref": "diagnostics-schema.json#/definitions/TimeoutsInExternalResources"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_en.properties
new file mode 100644
index 00000000000..bb0dd82ab88
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=The ThisObject property is read only
+diagnosticName=ThisObject assign
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
new file mode 100644
index 00000000000..efac1ae6719
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Свойство ЭтотОбъект доступно только для чтения
+diagnosticName=Присвоение заначения свойству ЭтотОбъект
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
new file mode 100644
index 00000000000..3c988ea61d0
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
@@ -0,0 +1,114 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.mdclasses.metadata.additional.CompatibilityMode;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.eclipse.lsp4j.Diagnostic;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class ThisObjectAssignDiagnosticTest extends AbstractDiagnosticTest<ThisObjectAssignDiagnostic> {
+  ThisObjectAssignDiagnosticTest() {
+    super(ThisObjectAssignDiagnostic.class);
+  }
+
+  @Test
+  void test832() {
+
+    DocumentContext documentContext = setCompatibilityMode(new CompatibilityMode(3, 2));
+
+    List<Diagnostic> diagnostics = getDiagnosticsFiltered(documentContext);
+
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+
+  @Test
+  void test833() {
+
+    DocumentContext documentContext = setCompatibilityMode(new CompatibilityMode(3, 4));
+
+    List<Diagnostic> diagnostics = getDiagnosticsFiltered(documentContext);
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(1, 4, 14);
+
+  }
+
+  @Test
+  void test836() {
+
+    DocumentContext documentContext = setCompatibilityMode(new CompatibilityMode(3, 14));
+
+    List<Diagnostic> diagnostics = getDiagnosticsFiltered(documentContext);
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(1, 4, 14);
+
+  }
+
+
+  @NotNull
+  private DocumentContext setCompatibilityMode(CompatibilityMode version) {
+
+    var documentContext = spy(getDocumentContext());
+    var serverContext = spy(documentContext.getServerContext());
+    var configuration = spy(serverContext.getConfiguration());
+
+    when(documentContext.getServerContext()).thenReturn(serverContext);
+    when(documentContext.getModuleType()).thenReturn(ModuleType.CommonModule);
+
+    when(serverContext.getConfiguration()).thenReturn(configuration);
+    when(configuration.getCompatibilityMode()).thenReturn(version);
+
+    return documentContext;
+  }
+
+  private List<Diagnostic> getDiagnosticsFiltered(DocumentContext documentContext) {
+    DiagnosticSupplier diagnosticSupplier = new DiagnosticSupplier(LanguageServerConfiguration.create());
+
+    Optional<BSLDiagnostic> first = diagnosticSupplier
+      .getDiagnosticInstances(documentContext)
+      .stream()
+      .filter(di -> di instanceof ThisObjectAssignDiagnostic)
+      .findFirst();
+
+    List<Diagnostic> diagnostics = new ArrayList<>();
+    if (first.isPresent()) {
+      diagnostics = first.get().getDiagnostics(documentContext);
+    }
+    return diagnostics;
+  }
+
+}
diff --git a/src/test/resources/diagnostics/ThisObjectAssignDiagnostic.bsl b/src/test/resources/diagnostics/ThisObjectAssignDiagnostic.bsl
new file mode 100644
index 00000000000..73c0ba0ca41
--- /dev/null
+++ b/src/test/resources/diagnostics/ThisObjectAssignDiagnostic.bsl
@@ -0,0 +1,5 @@
+Процедура ПриСозданииНаСервере()
+    ЭтотОбъект = РеквизитФормыВЗначение("Объект");
+КонецПроцедуры
+
+ЭтотОбъект.Реквизит1 = А;

From 76ddeef323459739b0ec4c040d7d6817dbd821ea Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 15 Apr 2020 16:40:37 +0300
Subject: [PATCH 058/444] stream magic

---
 .../ThisObjectAssignDiagnosticTest.java        | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
index 3c988ea61d0..3288aa4e8d0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
@@ -29,9 +29,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
@@ -98,17 +97,14 @@ private DocumentContext setCompatibilityMode(CompatibilityMode version) {
   private List<Diagnostic> getDiagnosticsFiltered(DocumentContext documentContext) {
     DiagnosticSupplier diagnosticSupplier = new DiagnosticSupplier(LanguageServerConfiguration.create());
 
-    Optional<BSLDiagnostic> first = diagnosticSupplier
+    return diagnosticSupplier
       .getDiagnosticInstances(documentContext)
       .stream()
-      .filter(di -> di instanceof ThisObjectAssignDiagnostic)
-      .findFirst();
-
-    List<Diagnostic> diagnostics = new ArrayList<>();
-    if (first.isPresent()) {
-      diagnostics = first.get().getDiagnostics(documentContext);
-    }
-    return diagnostics;
+      .filter(ThisObjectAssignDiagnostic.class::isInstance)
+      .findFirst()
+      .map(bslDiagnostic -> bslDiagnostic.getDiagnostics(documentContext))
+      .orElseGet(Collections::emptyList);
+
   }
 
 }

From 343551fba97f736439166e7b1ff1e708b9273785 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 15 Apr 2020 16:44:07 +0300
Subject: [PATCH 059/444] notNul rm

---
 .../diagnostics/ThisObjectAssignDiagnosticTest.java            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
index 3288aa4e8d0..9644fca0c60 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnosticTest.java
@@ -26,7 +26,6 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.CompatibilityMode;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import org.eclipse.lsp4j.Diagnostic;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
@@ -77,8 +76,6 @@ void test836() {
 
   }
 
-
-  @NotNull
   private DocumentContext setCompatibilityMode(CompatibilityMode version) {
 
     var documentContext = spy(getDocumentContext());

From da012e029de56bcdd3fc4d710b5bc3fee5a2fd06 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 15 Apr 2020 17:10:59 +0300
Subject: [PATCH 060/444] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BB=D1=8E=D1=87=20=D0=BD=D0=B0=20-q?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                     | 2 +-
 docs/en/index.md                                              | 2 +-
 docs/index.md                                                 | 2 +-
 .../github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java  | 2 +-
 .../_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java     | 2 +-
 .../_1c_syntax/bsl/languageserver/cli/FormatCommand.java      | 2 +-
 .../_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java     | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e605babc234..aea179d9510 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
- -S,--silent                Silent mode
+ -q,--silent                Silent mode
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP](https://microsoft.github.io/language-server-protocol/). Для взаимодействия используются stdin и stdout.
diff --git a/docs/en/index.md b/docs/en/index.md
index ea813b5468c..6d46285df71 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -58,7 +58,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
- -S,--silent                Silent mode
+ -q,--silent                Silent mode
 ```
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
diff --git a/docs/index.md b/docs/index.md
index cd6be8638e3..20e94187313 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -58,7 +58,7 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
  -r,--reporter <arg>        Reporter key
  -s,--srcDir <arg>          Source directory
  -v,--version               Version
- -S,--silent                Silent mode
+ -q,--silent                Silent mode
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 9b53f8192f7..e8b394b2e04 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -133,7 +133,7 @@ public static Options createOptions() {
     );
 
     Option silentMode = new Option(
-      "S",
+      "q",
       "silent",
       false,
       "Silent mode"
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 5de9afbb83d..638ef5c6334 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -64,7 +64,7 @@
  *  -r, (--reporter) &lt;arg&gt; -      Ключи "Репортеров", т.е. форматов отчетов, котрые необходимо сгенерировать после
  *                                выполнения анализа. Может быть указано более одного ключа. Если параметр опущен,
  *                                то вывод результата будет призведен в консоль.
- *  -S, (--silent)              -       Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
+ *  -q, (--silent)              -       Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
  * Выводимая информация:
  *  Выполняет анализ каталога исходных файлов и генерацию файлов отчета. Для каждого указанного ключа "Репортера"
  *  создается отдельный файл (каталог файлов). Реализованные "репортеры" находятся в пакете "reporter".
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index 74cf9df03b1..99d6cc4e31d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -49,7 +49,7 @@
  *  -s, (--srcDir) &lt;arg&gt; -  Путь к каталогу исходных файлов.
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то анализ выполняется в текущем каталоге запуска.
- *  -S, (--silent)             -  Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
+ *  -q, (--silent)             -  Флаг для отключения вывода прогресс-бара и дополнительных сообщений в консоль
  * Выводимая информация:
  *  Выполняет форматирование исходного кода в файлах каталога. Для форматирования используются правила и настройки
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 7c4c26930b0..317d30ce095 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -109,7 +109,7 @@ void testAnalyze() {
   @ExpectSystemExitWithStatus(0)
   void testAnalyzeSilent() {
     // given
-    String[] args = new String[]{"--analyze", "--srcDir", "./src/test/resources/cli", "-S"};
+    String[] args = new String[]{"--analyze", "--srcDir", "./src/test/resources/cli", "-q"};
 
     // when
     try {
@@ -148,7 +148,7 @@ void testFormat() {
   @ExpectSystemExitWithStatus(0)
   void testFormatSilent() {
     // given
-    String[] args = new String[]{"--format", "--srcDir", "./src/test/resources/cli", "-S"};
+    String[] args = new String[]{"--format", "--srcDir", "./src/test/resources/cli", "-q"};
 
     // when
     try {

From b76eca860a3a9b85afed549bb0d141ff6427ac63 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 15 Apr 2020 22:05:36 +0300
Subject: [PATCH 061/444] EOF parse error fix

---
 .../diagnostics/ParseErrorDiagnostic.java            | 10 +++++++++-
 .../diagnostics/ParseErrorDiagnosticTest.java        | 12 ++++++++++++
 .../diagnostics/ParseErrorDiagnosticEOF.bsl          |  4 ++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/diagnostics/ParseErrorDiagnosticEOF.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnostic.java
index a625e1420e7..0fd6c0676ae 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.IntervalSet;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ErrorNodeImpl;
@@ -50,6 +51,8 @@
 )
 public class ParseErrorDiagnostic extends AbstractListenerDiagnostic {
 
+  public static final int EOF = -1;
+
   public ParseErrorDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -82,8 +85,13 @@ public void enterFile(BSLParser.FileContext ctx) {
           .mapToObj(ParseErrorDiagnostic::getTokenName)
           .forEachOrdered(sj::add);
 
+        Token errorToken = node.exception.getOffendingToken();
+        if (errorToken.getType() == EOF) {
+          errorToken = node.getStart();
+        }
+
         diagnosticStorage.addDiagnostic(
-          node.exception.getOffendingToken(),
+          errorToken,
           info.getMessage(initialExpectedString + sj.toString())
         );
       });
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
index 39a2aee3c87..4e45802fa4b 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
@@ -49,4 +49,16 @@ void runTest() {
     assertThat(diagnostics, true).satisfiesAnyOf(onLineFive, onLineEight);
 
   }
+
+  @Test
+  void runTestError() {
+    // when
+    List<Diagnostic> diagnostics = getDiagnostics("ParseErrorDiagnosticEOF");
+
+    // then
+    assertThat(diagnostics.size()).isEqualTo(2); // why 2?
+    assertThat(diagnostics.get(0)).hasRange(3, 0, 3, 3);
+
+  }
+
 }
diff --git a/src/test/resources/diagnostics/ParseErrorDiagnosticEOF.bsl b/src/test/resources/diagnostics/ParseErrorDiagnosticEOF.bsl
new file mode 100644
index 00000000000..caab5171f61
--- /dev/null
+++ b/src/test/resources/diagnostics/ParseErrorDiagnosticEOF.bsl
@@ -0,0 +1,4 @@
+Процедура ОтключитьСканерШтрихкодов() Экспорт
+
+КонецПроцедуры
+HHH
\ No newline at end of file

From 2cc66f4148545b5b90628ef0e4ca7d7786b669d7 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 16 Apr 2020 14:44:37 +0300
Subject: [PATCH 062/444] Update
 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java

---
 .../languageserver/diagnostics/ParseErrorDiagnosticTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
index 4e45802fa4b..0661688398b 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ParseErrorDiagnosticTest.java
@@ -57,7 +57,7 @@ void runTestError() {
 
     // then
     assertThat(diagnostics.size()).isEqualTo(2); // why 2?
-    assertThat(diagnostics.get(0)).hasRange(3, 0, 3, 3);
+    assertThat(diagnostics, true).hasRange(3, 0, 3, 3);
 
   }
 

From 0c89be00a236f42da718fb5fe12cf399e290b1fe Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Thu, 16 Apr 2020 14:31:19 +0300
Subject: [PATCH 063/444] useLessForeach field FP fix

---
 .../diagnostics/UseLessForEachDiagnostic.java            | 9 +++++++++
 .../diagnostics/UseLessForEachDiagnosticTest.java        | 2 +-
 .../resources/diagnostics/UseLessForEachDiagnostic.bsl   | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
index 2d28040ca9f..dcd207fca7a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
@@ -59,6 +59,15 @@ public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
 
     TerminalNode iterator = ctx.IDENTIFIER();
     String iteratorIdName = iterator.getText();
+
+    boolean isVariable = documentContext.getSymbolTree().getVariables()
+      .stream()
+      .anyMatch(variableSymbol -> variableSymbol.getName().equalsIgnoreCase(iteratorIdName));
+
+    if (isVariable) {
+      return super.visitForEachStatement(ctx);
+    }
+
     boolean hasUsage = Trees.findAllTokenNodes(ctx.codeBlock(), BSLParser.IDENTIFIER)
       .stream()
       .filter(node -> iteratorIdName.equalsIgnoreCase(node.getText()))
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
index 1e2efcdbba6..5d9146e37fc 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
@@ -41,7 +41,7 @@ void test() {
 
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 12, 0, 20);
+      .hasRange(2, 12, 2, 20);
 
   }
 }
diff --git a/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl b/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
index 738acd3eb65..38f93d3aa9c 100644
--- a/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
@@ -1,3 +1,5 @@
+Перем Поле;
+
 Для Каждого Итератор Из Коллекция Цикл // Сработать Итератор неиспользуется в теле цикла
 	Итератор();
 КонецЦикла;	
@@ -30,3 +32,7 @@
 Для Каждого АСтруктура Из Б Цикл
     АСтруктура.Ключ.Метод();
 КонецЦикла;
+
+Для Каждого Поле Из Б Цикл
+    КакойтоМетод();
+КонецЦикла;

From eaf2d68e8474d374a69e21af5e1a2f9a9d7c38c1 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Thu, 16 Apr 2020 15:20:47 +0300
Subject: [PATCH 064/444] only GlobalVarible

---
 .../diagnostics/UseLessForEachDiagnostic.java  |  2 ++
 .../UseLessForEachDiagnosticTest.java          |  6 ++++--
 .../diagnostics/UseLessForEachDiagnostic.bsl   | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
index dcd207fca7a..60ddd6e738d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
 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;
@@ -62,6 +63,7 @@ public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
 
     boolean isVariable = documentContext.getSymbolTree().getVariables()
       .stream()
+      .filter(variableSymbol -> variableSymbol.getKind() == VariableKind.GLOBAL)
       .anyMatch(variableSymbol -> variableSymbol.getName().equalsIgnoreCase(iteratorIdName));
 
     if (isVariable) {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
index 5d9146e37fc..550639762e7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnosticTest.java
@@ -39,9 +39,11 @@ class UseLessForEachDiagnosticTest extends AbstractDiagnosticTest<UseLessForEach
   void test() {
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics).hasSize(2);
     assertThat(diagnostics, true)
-      .hasRange(2, 12, 2, 20);
+      .hasRange(2, 12, 2, 20)
+      .hasRange(39, 16, 26)
+    ;
 
   }
 }
diff --git a/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl b/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
index 38f93d3aa9c..17c0f06bf95 100644
--- a/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UseLessForEachDiagnostic.bsl
@@ -1,4 +1,4 @@
-Перем Поле;
+Перем ПолеМодуля;
 
 Для Каждого Итератор Из Коллекция Цикл // Сработать Итератор неиспользуется в теле цикла
 	Итератор();
@@ -33,6 +33,16 @@
     АСтруктура.Ключ.Метод();
 КонецЦикла;
 
-Для Каждого Поле Из Б Цикл
-    КакойтоМетод();
-КонецЦикла;
+Процедура А()
+
+    Перем ПолеМетода;
+
+    Для Каждого ПолеМетода Из Б Цикл // Тут ловить
+        КакойтоМетод();
+    КонецЦикла;
+
+    Для Каждого ПолеМодуля Из Б Цикл // Тут не ловить
+            КакойтоМетод();
+    КонецЦикла;
+
+КонецПроцедуры

From b4092ef08a5fe40efb79c72d7f794f238f1b05ac Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Thu, 16 Apr 2020 16:14:12 +0300
Subject: [PATCH 065/444] or ModuleVarible

---
 .../languageserver/diagnostics/UseLessForEachDiagnostic.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
index 60ddd6e738d..ff30c314a2f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UseLessForEachDiagnostic.java
@@ -63,7 +63,8 @@ public ParseTree visitForEachStatement(BSLParser.ForEachStatementContext ctx) {
 
     boolean isVariable = documentContext.getSymbolTree().getVariables()
       .stream()
-      .filter(variableSymbol -> variableSymbol.getKind() == VariableKind.GLOBAL)
+      .filter(variableSymbol -> variableSymbol.getKind() == VariableKind.GLOBAL
+        || variableSymbol.getKind() == VariableKind.MODULE)
       .anyMatch(variableSymbol -> variableSymbol.getName().equalsIgnoreCase(iteratorIdName));
 
     if (isVariable) {

From 50cfc71b8f03f3341de316e0343cdc1f15acd044 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Thu, 16 Apr 2020 16:39:35 +0300
Subject: [PATCH 066/444] change variableKind to Module

---
 .../computer/VariableSymbolComputer.java      |  2 +-
 .../context/computer/VariableSymbolTest.java  | 19 ++++++++++++++++---
 .../context/symbol/variableSymbolTest.bsl     |  4 ++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
index 5c5a93215fc..b24204ab837 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java
@@ -56,7 +56,7 @@ public List<VariableSymbol> compute() {
 
   @Override
   public ParseTree visitModuleVarDeclaration(BSLParser.ModuleVarDeclarationContext ctx) {
-    var symbol = createVariableSymbol(ctx, ctx.var_name(), ctx.EXPORT_KEYWORD() != null, VariableKind.GLOBAL);
+    var symbol = createVariableSymbol(ctx, ctx.var_name(), ctx.EXPORT_KEYWORD() != null, VariableKind.MODULE);
     variables.add(symbol);
 
     return ctx;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
index b2b3c662251..5b4c4b8f92e 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableDescription;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Range;
@@ -48,15 +49,16 @@ public class VariableSymbolTest {
   @Test
   void testVariableSymbolDescription() {
 
-    assertThat(variableSymbols).hasSize(7);
+    assertThat(variableSymbols).hasSize(8);
 
     assertThat(variableSymbols)
       .filteredOn(variableSymbol -> variableSymbol.getDescription().isEmpty())
-      .hasSize(4)
+      .hasSize(5)
       .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(12, 6, 12, 34)))
       .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(14, 6, 14, 27)))
       .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(16, 6, 16, 17)))
       .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(16, 19, 16, 30)))
+      .anyMatch(variableSymbol -> variableSymbol.getRange().equals(Ranges.create(19, 10, 19, 19)))
     ;
 
     assertThat(variableSymbols)
@@ -102,11 +104,22 @@ void testVariableNameRange() {
 
     assertThat(variableSymbols)
       .filteredOn(variableSymbol -> variableSymbol.getDescription().isEmpty())
-      .hasSize(4)
+      .hasSize(5)
       .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(12, 6, 12, 34)))
       .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(14, 6, 14, 27)))
       .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(16, 6, 16, 17)))
       .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(16, 19, 16, 30)))
+      .anyMatch(variableName -> variableName.getVariableNameRange().equals(Ranges.create(19, 10, 19, 19)))
+
     ;
   }
+
+  @Test
+  void testVariableKind() {
+
+    assertThat(variableSymbols.get(0).getKind()).isEqualTo(VariableKind.MODULE);
+    assertThat(variableSymbols.get(7).getKind()).isEqualTo(VariableKind.LOCAL);
+
+  }
+
 }
diff --git a/src/test/resources/context/symbol/variableSymbolTest.bsl b/src/test/resources/context/symbol/variableSymbolTest.bsl
index 5930a0769ad..e337ee31dcd 100644
--- a/src/test/resources/context/symbol/variableSymbolTest.bsl
+++ b/src/test/resources/context/symbol/variableSymbolTest.bsl
@@ -16,3 +16,7 @@
 
 Перем ПеременнаяА, ПеременнаяБ;
 
+Процедура А()
+    Перем Локальная;
+
+КонецПроцедуры
\ No newline at end of file

From 7b8c05c195743570c2619bea1e1ec0b84920e843 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Thu, 16 Apr 2020 22:48:06 +0700
Subject: [PATCH 067/444] =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/gen-bandge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/gen-bandge.py b/.github/scripts/gen-bandge.py
index 298d9e4f75e..8921ca039b2 100644
--- a/.github/scripts/gen-bandge.py
+++ b/.github/scripts/gen-bandge.py
@@ -7,7 +7,7 @@
   total = data.get('benchmarks')[0].get('stats').get('mean')
   value = '{:.2f}'.format(total)
 
-svg = badge(left_text='Benckmark (SSL 1.0)', right_text=value)
+svg = badge(left_text='Benchmark (SSL 1.0)', right_text=value)
 f = open('benchmark.svg', 'w')
 f.write(svg)
 f.close()

From 765195f806cc1b2392dbc2abd4a09609dd303e6f Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Thu, 16 Apr 2020 22:48:23 +0700
Subject: [PATCH 068/444] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B1=D0=B5=D0=B7=20Typ?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/benchmark.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/benchmark.py b/.github/scripts/benchmark.py
index e515afdce7b..4f299a0761d 100644
--- a/.github/scripts/benchmark.py
+++ b/.github/scripts/benchmark.py
@@ -2,14 +2,17 @@
 import os
 import re
 import ntpath
+import json
 
 pattern = r"bsl.+\.jar"
-dirName = os.getcwd() + "/build/libs"  
+thisPath = os.getcwd()
+dirName = thisPath + "/build/libs"  
 
 def test_analyze_ssl31(benchmark):
     benchmark(some_func, None)
 
 def some_func(arg):
+    pathToConfig = createBSLLSConfiguration()
     fullname = get_bslls_jar(dirName)
     cmdArgs = ['java']
     cmdArgs.append('-jar')
@@ -17,6 +20,8 @@ def some_func(arg):
     cmdArgs.append('-a')
     cmdArgs.append('-s')
     cmdArgs.append('ssl')
+    cmdArgs.append('-c')
+    cmdArgs.append(pathToConfig)
     cmd = ' '.join(cmdArgs) 
     os.system(cmd)
 
@@ -27,3 +32,14 @@ def get_bslls_jar(dir):
         if os.path.isfile(fullname) and re.search(pattern, fullname) and fullname.find('sources.jar') == -1 and fullname.find('javadoc.jar') == -1:
             return ntpath.basename(fullname)
     return None
+
+def createBSLLSConfiguration():
+    newPath = thisPath + "/ssl/.bsl-language-server.json"
+    data = {}
+    data['configurationRoot'] = './src'
+    data['diagnostics'] = {'Typo': False}
+
+    with open(newPath, 'w') as outfile:
+        json.dump(data, outfile)
+
+    return newPath
\ No newline at end of file

From 0dc1f3a85b9b8f9611318c381c617633b254faf7 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 16 Apr 2020 22:35:39 +0300
Subject: [PATCH 069/444] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=BE=20=D1=83=D1=81=D0=BA=D0=BE=D1=80=D0=B5=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ресурсы вынесены в поля класса
убран двойной прогон по списку токенов
условия фильтра оптимизированы
---
 .../InvalidCharacterInFileDiagnostic.java     | 39 +++++++++++--------
 .../InvalidCharacterInFileDiagnosticTest.java | 13 +++++--
 .../InvalidCharacterInFileDiagnostic.bsl      | 15 +++++++
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index 2c3b19877e2..a0e68601c66 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -28,7 +28,9 @@
 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.providers.CodeActionProvider;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.CodeAction;
@@ -69,31 +71,36 @@ public class InvalidCharacterInFileDiagnostic extends AbstractVisitorDiagnostic
       "])",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
+  private final String diagnosticMessageDash;
+  private final String diagnosticMessageSpace;
+
   public InvalidCharacterInFileDiagnostic(DiagnosticInfo info) {
     super(info);
+    diagnosticMessageDash = info.getResourceString("diagnosticMessageDash");
+    diagnosticMessageSpace = info.getResourceString("diagnosticMessageSpace");
   }
 
   @Override
   public ParseTree visitFile(BSLParser.FileContext ctx) {
-    documentContext
-      .getTokens()
-      .stream()
-      .filter((Token token) -> ILLEGAL_DASH_PATTERN.matcher(token.getText()).find())
-      .forEach(token ->
-        diagnosticStorage.addDiagnostic(
-          token,
-          info.getResourceString("diagnosticMessageDash"))
-      );
 
     documentContext
       .getTokens()
       .stream()
-      .filter((Token token) -> ILLEGAL_SPACE_PATTERN.matcher(token.getText()).find())
+      .filter((Token token) -> token.getChannel() == Lexer.HIDDEN || token.getType() == BSLLexer.STRING
+          || token.getType() == BSLLexer.LINE_COMMENT)
       .forEach(token ->
-        diagnosticStorage.addDiagnostic(
-          token,
-          info.getResourceString("diagnosticMessageSpace")
-        )
+        {
+          var text = token.getText();
+          if (ILLEGAL_SPACE_PATTERN.matcher(text).find()) {
+
+            diagnosticStorage.addDiagnostic(token, diagnosticMessageSpace);
+
+          } else if (ILLEGAL_DASH_PATTERN.matcher(text).find()) {
+
+            diagnosticStorage.addDiagnostic(token, diagnosticMessageDash);
+
+          }
+        }
       );
 
     return ctx;
@@ -109,7 +116,7 @@ public List<CodeAction> getQuickFixes(
     List<TextEdit> textEdits = new ArrayList<>();
 
     diagnostics.stream()
-      .filter(diagnostic -> diagnostic.getMessage().equals(info.getResourceString("diagnosticMessageSpace")))
+      .filter(diagnostic -> diagnostic.getMessage().equals(diagnosticMessageSpace))
       .forEach((Diagnostic diagnostic) -> {
         Range range = diagnostic.getRange();
         TextEdit textEdit = new TextEdit(range,
@@ -119,7 +126,7 @@ public List<CodeAction> getQuickFixes(
       });
 
     diagnostics.stream()
-      .filter(diagnostic -> diagnostic.getMessage().equals(info.getResourceString("diagnosticMessageDash")))
+      .filter(diagnostic -> diagnostic.getMessage().equals(diagnosticMessageDash))
       .forEach((Diagnostic diagnostic) -> {
         Range range = diagnostic.getRange();
         TextEdit textEdit = new TextEdit(range,
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
index 385dcd97dc1..92017bd4d5d 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
@@ -42,7 +42,6 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(8);
     assertThat(diagnostics, true)
       .hasRange(1, 14, 1, 17)
       .hasRange(2, 15, 2, 18)
@@ -52,7 +51,13 @@ void test() {
       .hasRange(6, 0, 6, 33)
       .hasRange(12, 0, 12, 32)
       .hasRange(14, 15, 14, 18)
-    ;
+      .hasRange(17, 0, 17, 1)
+      .hasRange(20, 0, 20, 1)
+      .hasRange(22, 0, 22, 1)
+      .hasRange(24, 0, 24, 1)
+      .hasRange(26, 0, 26, 1)
+      .hasRange(28, 0, 28, 1)
+      .hasSize(14);
 
   }
 
@@ -69,7 +74,7 @@ void testQuickFix() {
       .first()
       .matches(codeAction -> codeAction.getKind().equals(CodeActionKind.QuickFix))
 
-      .matches(codeAction -> codeAction.getDiagnostics().size() == 8)
+      .matches(codeAction -> codeAction.getDiagnostics().size() == 14)
       .matches(codeAction -> codeAction.getDiagnostics().get(3).equals(diagnostics.get(3)))
 
       .matches(codeAction -> codeAction.getEdit().getChanges().size() == 1)
@@ -87,7 +92,7 @@ void testQuickFix() {
       .first()
       .matches(codeAction -> codeAction.getKind().equals(CodeActionKind.QuickFix))
 
-      .matches(codeAction -> codeAction.getDiagnostics().size() == 8)
+      .matches(codeAction -> codeAction.getDiagnostics().size() == 14)
       .matches(codeAction -> codeAction.getDiagnostics().get(7).equals(diagnostics.get(7)))
 
       .matches(codeAction -> codeAction.getEdit().getChanges().size() == 1)
diff --git a/src/test/resources/diagnostics/InvalidCharacterInFileDiagnostic.bsl b/src/test/resources/diagnostics/InvalidCharacterInFileDiagnostic.bsl
index 6531270387a..3a703dac5d0 100644
--- a/src/test/resources/diagnostics/InvalidCharacterInFileDiagnostic.bsl
+++ b/src/test/resources/diagnostics/InvalidCharacterInFileDiagnostic.bsl
@@ -13,3 +13,18 @@
 // В этом комментарии только НПП
 
 Строка = "А" + " " + "И";
+
+//в строке ниже неразрывный пробел
+ 
+// минусы с ошибками
+//СреднееТире = "
+–;
+//ЦифровоеТире = "
+‒;
+//ДлинноеТире = "
+—;
+//ГоризонтальнаяЛиния = "
+―;
+//НеправильныйМинус = "
+−;
+//конец файла

From 05d0d9872ca11749ede8e3c7c964573bcf6d8c68 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Fri, 17 Apr 2020 12:16:57 +0300
Subject: [PATCH 070/444] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/InvalidCharacterInFileDiagnostic.java          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index a0e68601c66..e6f4b64e58a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -86,8 +86,7 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
     documentContext
       .getTokens()
       .stream()
-      .filter((Token token) -> token.getChannel() == Lexer.HIDDEN || token.getType() == BSLLexer.STRING
-          || token.getType() == BSLLexer.LINE_COMMENT)
+      .filter((Token token) -> token.getChannel() == Lexer.HIDDEN || token.getType() == BSLLexer.STRING)
       .forEach(token ->
         {
           var text = token.getText();

From 29fc0d2e5b926b5e6229350d96ad480cfceec77c Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 17 Apr 2020 22:22:27 +0700
Subject: [PATCH 071/444] =?UTF-8?q?=D0=91=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B0=D1=86=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataExchangeLoadingDiagnostic.java        | 109 ++++++++++++++++++
 ...ataExchangeLoadingDiagnostic_en.properties |   2 +
 ...ataExchangeLoadingDiagnostic_ru.properties |   2 +
 3 files changed, 113 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
new file mode 100644
index 00000000000..385f284b074
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -0,0 +1,109 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.DiagnosticScope;
+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.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.CRITICAL,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.ObjectModule
+  },
+  minutesToFix = 10,
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE
+  }
+
+)
+public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String SUB_NAMES = "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$";
+  private static final String CONDITION =
+    "ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load";
+
+  private static final Pattern searchSubNames = Pattern.compile(
+    SUB_NAMES,
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern searchCondition = Pattern.compile(
+    CONDITION,
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
+    var subName = ctx.subName();
+    if (subName != null) {
+      if (searchSubNames.matcher(subName.getText()).matches() && needCreateIssue(ctx)) {
+        diagnosticStorage.addDiagnostic(ctx);
+      }
+    }
+    return ctx;
+  }
+
+  private boolean needCreateIssue(BSLParser.ProcDeclarationContext ctx) {
+    BSLParser.ProcedureContext procedureContext = (BSLParser.ProcedureContext) ctx.getParent();
+    var statements = procedureContext.subCodeBlock().codeBlock().statement();
+    if (statements != null) {
+      if (!statements.isEmpty()) {
+        return !foundLoadConditionWithReturn(statements.get(0));
+      }
+    }
+    return true;
+  }
+
+  private boolean foundLoadConditionWithReturn(BSLParser.StatementContext ctx) {
+    var ifStatement = ctx.compoundStatement().ifStatement();
+    if (ifStatement != null) {
+      var ifBranch = ifStatement.ifBranch();
+      var text = ifBranch.expression().getText();
+      return searchCondition.matcher(text).find() && foundReturnStatement(ifBranch);
+    }
+    return false;
+  }
+
+  private boolean foundReturnStatement(BSLParser.IfBranchContext ctx) {
+    var ifStatements = ctx.codeBlock().statement();
+    if (ifStatements != null) {
+      var itemStatement = ifStatements.get(0);
+      return itemStatement.compoundStatement().returnStatement() != null;
+    }
+    return false;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
new file mode 100644
index 00000000000..7ecbe607958
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=There is no check for the attribute DataExchange.Load in the object's event handler
+diagnosticName=Add a check for the attribute ExchangeData.Load at the very beginning of the procedure
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
new file mode 100644
index 00000000000..d13a2b3e7bb
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта
+diagnosticName=Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры

From d85c2fff267e1b76da5d3c83d7b1a74757b848bf Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 17 Apr 2020 22:22:51 +0700
Subject: [PATCH 072/444] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataExchangeLoadingDiagnosticTest.java    | 52 +++++++++++++++++++
 .../DataExchangeLoadingDiagnostic.bsl         | 38 ++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
new file mode 100644
index 00000000000..6d91b558a71
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
@@ -0,0 +1,52 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.utils.Ranges;
+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 DataExchangeLoadingDiagnosticTest extends AbstractDiagnosticTest<DataExchangeLoadingDiagnostic> {
+  DataExchangeLoadingDiagnosticTest() {
+    super(DataExchangeLoadingDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics)
+      .hasSize(3)
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(7, 0, 7, 29)))
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(19, 0, 19, 25)))
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(33, 0, 33, 30)));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
new file mode 100644
index 00000000000..c943ac42539
--- /dev/null
+++ b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
@@ -0,0 +1,38 @@
+Процедура ПередУдалением(Отказ)
+    Если ОбменДанными.Загрузка = Истина Тогда
+        Возврат;
+    КонецЕсли;
+    Отказ = ОбщийМодуль.ЕстьОтказ(ОбменДанными.Загрузка);
+КонецПроцедуры
+
+Процедура ПередЗаписью(Отказ) // Ошибка
+    Если Отказ Тогда
+        Сообщить("Это отказ");
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура ПриЗаписи(Отказ)
+    Если ОбменДанными.Загрузка Тогда
+        Возврат;
+    КонецЕсли;
+КонецПроцедуры
+
+Procedure OnWrite(Cancel)
+    Var Value;
+    If DataExchange.Recipients Then
+        Return;
+    EndIf;
+EndProcedure
+
+Procedure BeforeWrite(Cancel)
+    Var Value;
+    If DataExchange.Load Then
+        Return;
+    EndIf;
+EndProcedure
+
+Procedure BeforeDelete(Cancel)
+    For Each Item in new Array Do
+        Return;
+    EndDo;
+EndProcedure
\ No newline at end of file

From 2974178b66ce481b442f425739ef76edf4432f47 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Fri, 17 Apr 2020 22:23:32 +0700
Subject: [PATCH 073/444] =?UTF-8?q?=D0=94=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=20+=20=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DataExchangeLoading.md       | 69 +++++++++++++++++++
 docs/diagnostics/index.md                     |  5 +-
 docs/en/diagnostics/DataExchangeLoading.md    | 68 ++++++++++++++++++
 docs/en/diagnostics/index.md                  |  5 +-
 .../configuration/diagnostics-schema.json     | 10 +++
 .../languageserver/configuration/schema.json  |  3 +
 6 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/DataExchangeLoading.md
 create mode 100644 docs/en/diagnostics/DataExchangeLoading.md

diff --git a/docs/diagnostics/DataExchangeLoading.md b/docs/diagnostics/DataExchangeLoading.md
new file mode 100644
index 00000000000..b792db68d54
--- /dev/null
+++ b/docs/diagnostics/DataExchangeLoading.md
@@ -0,0 +1,69 @@
+# Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры (DataExchangeLoading)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL` | `Критичный` | `Да` | `10` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+Все действия в процедурах-обработчиков событий ПередЗаписью, ПриЗаписи, ПередУдалением должны выполняться 
+после проверки на ОбменДанными.Загрузка.
+
+Это необходимо для того, чтобы никакая бизнес-логика объекта не выполнялась при записи объекта через механизм обмена 
+данными, поскольку она уже была выполнена для объекта в том узле, где он был создан. В этом случае все данные 
+загружаются в ИБ "как есть", без искажений (изменений), проверок или каких-либо других дополнительных действий, 
+препятствующих загрузке данных.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Неправильно:
+```bsl
+Процедура ПередЗаписью(Отказ)
+
+    Если Не Отказ Тогда
+        ЗапутитьКакойТоАлгоритм();
+    КонецЕсли;
+
+    // код обработчика
+    //
+    // ...
+    
+КонецПроцедуры
+```
+Правильно:
+```bsl
+Процедура ПередЗаписью(Отказ)
+    Если ОбменДанными.Загрузка Тогда
+         Возврат;
+    КонецЕсли;
+
+    // код обработчика
+    // ...
+КонецПроцедуры
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+
+* [Стандарт: Использование признака ОбменДанными.Загрузка в обработчиках событий объекта](https://its.1c.ru/db/v8std#content:773)
+* [Обработчик события ПриЗаписи](https://its.1c.ru/db/v8std#content:465)
+* [Обработчик события ПередЗаписью](https://its.1c.ru/db/v8std#content:464)
+* [Обработчик события ПередУдалением](https://its.1c.ru/db/v8std#content:752)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:DataExchangeLoading-off
+// BSLLS:DataExchangeLoading-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"DataExchangeLoading": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index d1eccfc2ac0..7037e7ad77c 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **88**
+Общее количество: **89**
 
 * Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **29**
+* Ошибка: **30**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -28,6 +28,7 @@
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
diff --git a/docs/en/diagnostics/DataExchangeLoading.md b/docs/en/diagnostics/DataExchangeLoading.md
new file mode 100644
index 00000000000..afbeffb325a
--- /dev/null
+++ b/docs/en/diagnostics/DataExchangeLoading.md
@@ -0,0 +1,68 @@
+# Add a check for the attribute ExchangeData.Load at the very beginning of the procedure (DataExchangeLoading)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Critical` | `Yes` | `10` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Bad:
+```bsl
+Procedure BeforeWrite(Cancel)
+
+    If Not Cancel Then
+        RandomAlgorithm();
+    EndIf;
+
+    // code handler
+    //
+    // ...
+    
+EndProcedure
+```
+
+Good:
+```bsl
+Procedure BeforeWrite(Cancel)
+    If DataExchange.Load Then
+         Return;
+    EndIf;
+
+    // code handler
+    // ...
+EndProcedure
+```
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* [Стандарт: Использование признака ОбменДанными.Загрузка в обработчиках событий объекта](https://its.1c.ru/db/v8std#content:773)
+* [Обработчик события ПриЗаписи](https://its.1c.ru/db/v8std#content:465)
+* [Обработчик события ПередЗаписью](https://its.1c.ru/db/v8std#content:464)
+* [Обработчик события ПередУдалением](https://its.1c.ru/db/v8std#content:752)
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:DataExchangeLoading-off
+// BSLLS:DataExchangeLoading-on
+```
+
+### Parameter for config
+
+```json
+"DataExchangeLoading": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 92ef4e4c507..1e53873c90c 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **88**
+Total: **89**
 
-* Error: **29**
+* Error: **30**
 * Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
@@ -28,6 +28,7 @@ Total: **88**
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | Add a check for the attribute ExchangeData.Load at the very beginning of the procedure | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 3369ec036ca..660be6ebd5f 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -150,6 +150,16 @@
             },
             "$id": "#/definitions/CyclomaticComplexity"
         },
+        "DataExchangeLoading": {
+            "description": "Add a check for the attribute ExchangeData.Load at the very beginning of the procedure",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Add a check for the attribute ExchangeData.Load at the very beginning of the procedure",
+            "$id": "#/definitions/DataExchangeLoading"
+        },
         "DeletingCollectionItem": {
             "description": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
             "default": null,
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 c34797acb3e..befc3db93e5 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
@@ -134,6 +134,9 @@
                 "CyclomaticComplexity": {
                     "$ref": "diagnostics-schema.json#/definitions/CyclomaticComplexity"
                 },
+                "DataExchangeLoading": {
+                    "$ref": "diagnostics-schema.json#/definitions/DataExchangeLoading"
+                },
                 "DeletingCollectionItem": {
                     "$ref": "diagnostics-schema.json#/definitions/DeletingCollectionItem"
                 },

From bd648c9e958115c709e7590815ff99ea72dfe24a Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 18 Apr 2020 23:06:39 +0700
Subject: [PATCH 074/444] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B8=D0=BC=D1=8B,?=
 =?UTF-8?q?=20=D1=83=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B0,=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F?=
 =?UTF-8?q?=20=D1=83=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=205=20=D0=BC=D0=B8=D0=BD,=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B5=D1=89=D0=B5=20?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BF=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataExchangeLoadingDiagnostic.java        | 81 ++++++++++---------
 .../DataExchangeLoadingDiagnosticTest.java    |  6 +-
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 385f284b074..83edfa2c8b1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -27,10 +27,13 @@
 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.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
@@ -38,9 +41,11 @@
   severity = DiagnosticSeverity.CRITICAL,
   scope = DiagnosticScope.BSL,
   modules = {
-    ModuleType.ObjectModule
+    ModuleType.ObjectModule,
+    ModuleType.RecordSetModule,
+    ModuleType.ValueManagerModule
   },
-  minutesToFix = 10,
+  minutesToFix = 5,
   tags = {
     DiagnosticTag.STANDARD,
     DiagnosticTag.BADPRACTICE,
@@ -50,15 +55,11 @@
 )
 public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final String SUB_NAMES = "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$";
-  private static final String CONDITION =
-    "ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load";
-
   private static final Pattern searchSubNames = Pattern.compile(
-    SUB_NAMES,
+    "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private static final Pattern searchCondition = Pattern.compile(
-    CONDITION,
+    "(ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load)$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
@@ -67,43 +68,51 @@ public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
 
   @Override
   public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
-    var subName = ctx.subName();
-    if (subName != null) {
-      if (searchSubNames.matcher(subName.getText()).matches() && needCreateIssue(ctx)) {
-        diagnosticStorage.addDiagnostic(ctx);
-      }
-    }
+    Optional.of(ctx)
+      .map(BSLParser.ProcDeclarationContext::subName)
+      .filter(subName -> searchSubNames.matcher(subName.getText()).find() && needCreateIssue(ctx))
+      .flatMap(context ->
+        Optional.of(documentContext.getSymbolTree())
+          .map(symbolTree -> symbolTree.getMethodSymbol((BSLParser.SubContext) getSubContext(ctx)))
+          .get())
+      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange()));
     return ctx;
   }
 
   private boolean needCreateIssue(BSLParser.ProcDeclarationContext ctx) {
-    BSLParser.ProcedureContext procedureContext = (BSLParser.ProcedureContext) ctx.getParent();
-    var statements = procedureContext.subCodeBlock().codeBlock().statement();
-    if (statements != null) {
-      if (!statements.isEmpty()) {
-        return !foundLoadConditionWithReturn(statements.get(0));
-      }
-    }
-    return true;
+    return Optional.of(ctx)
+      .map(BSLParser.ProcDeclarationContext::getParent)
+      .map(BSLParser.ProcedureContext.class::cast)
+      .map(BSLParser.ProcedureContext::subCodeBlock)
+      .map(BSLParser.SubCodeBlockContext::codeBlock)
+      .map(BSLParser.CodeBlockContext::statement)
+      .flatMap(context -> context.stream().findFirst())
+      .filter(context -> !foundLoadConditionWithReturn(context))
+      .isPresent();
   }
 
   private boolean foundLoadConditionWithReturn(BSLParser.StatementContext ctx) {
-    var ifStatement = ctx.compoundStatement().ifStatement();
-    if (ifStatement != null) {
-      var ifBranch = ifStatement.ifBranch();
-      var text = ifBranch.expression().getText();
-      return searchCondition.matcher(text).find() && foundReturnStatement(ifBranch);
-    }
-    return false;
+    return Optional.of(ctx)
+      .map(BSLParser.StatementContext::compoundStatement)
+      .map(BSLParser.CompoundStatementContext::ifStatement)
+      .map(BSLParser.IfStatementContext::ifBranch)
+      .filter(context ->
+        searchCondition.matcher(context.expression().getText()).find()
+          && foundReturnStatement(context))
+      .isPresent();
   }
 
-  private boolean foundReturnStatement(BSLParser.IfBranchContext ctx) {
-    var ifStatements = ctx.codeBlock().statement();
-    if (ifStatements != null) {
-      var itemStatement = ifStatements.get(0);
-      return itemStatement.compoundStatement().returnStatement() != null;
-    }
-    return false;
+  private boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
+    return Optional.of(ifBranch)
+      .map(BSLParser.IfBranchContext::codeBlock)
+      .map(BSLParser.CodeBlockContext::statement)
+      .flatMap(context -> context.stream().findFirst())
+      .map(BSLParser.StatementContext::compoundStatement)
+      .map(BSLParser.CompoundStatementContext::returnStatement)
+      .isPresent();
   }
 
+  private ParserRuleContext getSubContext(BSLParser.ProcDeclarationContext ctx) {
+    return Trees.getAncestorByRuleIndex((ParserRuleContext) ctx.getRuleContext(), BSLParser.RULE_sub);
+  }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
index 6d91b558a71..41653ea5653 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
@@ -42,11 +42,11 @@ void test() {
     assertThat(diagnostics)
       .hasSize(3)
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
-        Ranges.create(7, 0, 7, 29)))
+        Ranges.create(7, 10, 7, 22)))
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
-        Ranges.create(19, 0, 19, 25)))
+        Ranges.create(19, 10, 19, 17)))
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
-        Ranges.create(33, 0, 33, 30)));
+        Ranges.create(33, 10, 33, 22)));
 
   }
 }

From c5e66d4df31d18afc734d16091d4da63f6e74d6b Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 18 Apr 2020 23:07:00 +0700
Subject: [PATCH 075/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D0=B0?=
 =?UTF-8?q?=D1=85=20(=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D1=83=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DataExchangeLoadingDiagnostic_en.properties   | 4 ++--
 .../diagnostics/DataExchangeLoadingDiagnostic_ru.properties   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
index 7ecbe607958..f905e642ceb 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=There is no check for the attribute DataExchange.Load in the object's event handler
-diagnosticName=Add a check for the attribute ExchangeData.Load at the very beginning of the procedure
+diagnosticMessage=Add a check for the attribute ExchangeData.Load at the very beginning of the procedure
+diagnosticName=There is no check for the attribute DataExchange.Load in the object's event handler
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
index d13a2b3e7bb..0b0dca5dc07 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта
-diagnosticName=Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры
+diagnosticMessage=Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры
+diagnosticName=Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта

From becd88b7484f30469a05570b1ad26fde55386d9a Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Sat, 18 Apr 2020 19:58:40 +0300
Subject: [PATCH 076/444] =?UTF-8?q?=D0=A3=D1=81=D0=BA=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20-=20=D0=92=D0=BC=D0=B5=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=202=D1=85=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D1=8F=D1=8E=20?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D1=83=20=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvalidCharacterInFileDiagnostic.java     | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index e6f4b64e58a..ad0490e69ca 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -56,20 +56,23 @@
 
 public class InvalidCharacterInFileDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
 
-  private static final Pattern ILLEGAL_DASH_PATTERN = Pattern.compile("([" +
+  public static final String SPACE_REGEX = "(?:" +
+    "\\u00A0" + // 160
+    ")";
+
+  private static final Pattern ILLEGAL_PATTERN = Pattern.compile("(?:[" +
       "\\u00AD" + // 173
       "\\u2012" + // 8210
       "\\u2013" + // 8211
       "\\u2014" + // 8212
       "\\u2015" + // 8213
       "\\u2212" + // 8722
-      "])",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+      "])" +
+      "|" + SPACE_REGEX,
+    Pattern.UNICODE_CASE);
 
-  private static final Pattern ILLEGAL_SPACE_PATTERN = Pattern.compile("([" +
-      "\\u00A0" + // 160
-      "])",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern ILLEGAL_SPACE_PATTERN = Pattern.compile(SPACE_REGEX,
+    Pattern.UNICODE_CASE);
 
   private final String diagnosticMessageDash;
   private final String diagnosticMessageSpace;
@@ -87,18 +90,16 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
       .getTokens()
       .stream()
       .filter((Token token) -> token.getChannel() == Lexer.HIDDEN || token.getType() == BSLLexer.STRING)
+      .filter((Token token) -> ILLEGAL_PATTERN.matcher(token.getText()).find())
       .forEach(token ->
         {
           var text = token.getText();
-          if (ILLEGAL_SPACE_PATTERN.matcher(text).find()) {
-
-            diagnosticStorage.addDiagnostic(token, diagnosticMessageSpace);
-
-          } else if (ILLEGAL_DASH_PATTERN.matcher(text).find()) {
-
-            diagnosticStorage.addDiagnostic(token, diagnosticMessageDash);
+            String message = diagnosticMessageDash;
+            if (ILLEGAL_SPACE_PATTERN.matcher(text).find()){
+              message = diagnosticMessageSpace;
+            }
+            diagnosticStorage.addDiagnostic(token, message);
 
-          }
         }
       );
 
@@ -129,7 +130,7 @@ public List<CodeAction> getQuickFixes(
       .forEach((Diagnostic diagnostic) -> {
         Range range = diagnostic.getRange();
         TextEdit textEdit = new TextEdit(range,
-          ILLEGAL_DASH_PATTERN.matcher(documentContext.getText(range)).replaceAll("-"));
+          ILLEGAL_PATTERN.matcher(documentContext.getText(range)).replaceAll("-"));
 
         textEdits.add(textEdit);
       });

From 28eaa364f9a7650f758543c19b0ff2474b34c211 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Sat, 18 Apr 2020 22:03:01 +0300
Subject: [PATCH 077/444] =?UTF-8?q?=D1=83=D1=87=D0=B5=D1=82=20=D0=BC=D1=83?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B8=D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvalidCharacterInFileDiagnostic.java     |  7 ++++-
 .../InvalidCharacterInFileDiagnosticTest.java | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index ad0490e69ca..034c98aaca5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -89,7 +89,12 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
     documentContext
       .getTokens()
       .stream()
-      .filter((Token token) -> token.getChannel() == Lexer.HIDDEN || token.getType() == BSLLexer.STRING)
+      .filter((Token token) -> token.getChannel() == Lexer.HIDDEN
+        || token.getType() == BSLLexer.STRINGPART
+        || token.getType() == BSLLexer.STRING
+        || token.getType() == BSLLexer.STRINGSTART
+        || token.getType() == BSLLexer.STRINGTAIL
+      )
       .filter((Token token) -> ILLEGAL_PATTERN.matcher(token.getText()).find())
       .forEach(token ->
         {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
index 92017bd4d5d..1013ac881e0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnosticTest.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;
 import org.eclipse.lsp4j.Diagnostic;
@@ -61,6 +62,35 @@ void test() {
 
   }
 
+  @Test
+  void testMultiString() {
+    String module = "//в строке ниже неразрывный пробел\n" +
+      "А = \" \n" +
+      "|// минусы с ошибками\n" +
+      "|//СреднееТире = \n" +
+      "|–;\n" +
+      "|//ЦифровоеТире = \n" +
+      "|‒;\n" +
+      "|//ДлинноеТире = \n" +
+      "|—;\n" +
+      "|//ГоризонтальнаяЛиния = \n" +
+      "|―;\n" +
+      "|//НеправильныйМинус = \n" +
+      "|−;\";\n";
+
+    var documentContext = TestUtils.getDocumentContext(module);
+    var diagnostics = getDiagnostics(documentContext);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 4, 1, 6)
+      .hasRange(4, 0, 4, 3)
+      .hasRange(6, 0, 6, 3)
+      .hasRange(8, 0, 8, 3)
+      .hasRange(10, 0, 10, 3)
+      .hasRange(12, 0, 12, 4)
+      .hasSize(6);
+  }
+
   @Test
   void testQuickFix() {
 

From e7668555c5e4fa7db13334250a86028e65c2baa6 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 12:06:27 +0700
Subject: [PATCH 078/444] =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0=BE=20statement=20=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80.=20=D0=9F?=
 =?UTF-8?q?=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
 =?UTF-8?q?=20false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataExchangeLoadingDiagnostic.java        | 46 +++++++++++++++----
 ...ataExchangeLoadingDiagnostic_en.properties |  2 +
 ...ataExchangeLoadingDiagnostic_ru.properties |  2 +
 .../DataExchangeLoadingDiagnosticTest.java    | 26 ++++++++++-
 .../DataExchangeLoadingDiagnostic.bsl         | 10 +++-
 5 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 83edfa2c8b1..b0591f95470 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -23,17 +23,21 @@
 
 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.DiagnosticParameter;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticScope;
 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.utils.DiagnosticHelper;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
@@ -59,18 +63,35 @@ public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
     "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private static final Pattern searchCondition = Pattern.compile(
-    "(ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load)$",
+    "ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
+  private static final boolean FIND_FIRST = false;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + FIND_FIRST
+  )
+  private boolean findFirst = FIND_FIRST;
+
   public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
+  @Override
+  public void configure(Map<String, Object> configuration) {
+    if (configuration == null) return;
+    DiagnosticHelper.configureDiagnostic(this, configuration, "findFirst");
+  }
+
   @Override
   public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
     Optional.of(ctx)
       .map(BSLParser.ProcDeclarationContext::subName)
-      .filter(subName -> searchSubNames.matcher(subName.getText()).find() && needCreateIssue(ctx))
+      .filter(subName ->
+        searchSubNames.matcher(subName.getText()).find()
+          && !checkPassed(ctx)
+      )
       .flatMap(context ->
         Optional.of(documentContext.getSymbolTree())
           .map(symbolTree -> symbolTree.getMethodSymbol((BSLParser.SubContext) getSubContext(ctx)))
@@ -79,15 +100,23 @@ public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
     return ctx;
   }
 
-  private boolean needCreateIssue(BSLParser.ProcDeclarationContext ctx) {
+  private boolean checkPassed(BSLParser.ProcDeclarationContext ctx) {
+    AtomicInteger orderStatement = new AtomicInteger();
     return Optional.of(ctx)
       .map(BSLParser.ProcDeclarationContext::getParent)
       .map(BSLParser.ProcedureContext.class::cast)
       .map(BSLParser.ProcedureContext::subCodeBlock)
       .map(BSLParser.SubCodeBlockContext::codeBlock)
       .map(BSLParser.CodeBlockContext::statement)
-      .flatMap(context -> context.stream().findFirst())
-      .filter(context -> !foundLoadConditionWithReturn(context))
+      .flatMap(context -> context.stream()
+        .filter(statement -> {
+          orderStatement.getAndIncrement();
+          if (findFirst && orderStatement.get() > 1) {
+            return false;
+          }
+          return foundLoadConditionWithReturn(statement);
+        })
+        .findFirst())
       .isPresent();
   }
 
@@ -106,9 +135,10 @@ private boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
     return Optional.of(ifBranch)
       .map(BSLParser.IfBranchContext::codeBlock)
       .map(BSLParser.CodeBlockContext::statement)
-      .flatMap(context -> context.stream().findFirst())
-      .map(BSLParser.StatementContext::compoundStatement)
-      .map(BSLParser.CompoundStatementContext::returnStatement)
+      .flatMap(context -> context.stream()
+        .map(BSLParser.StatementContext::compoundStatement)
+        .map(BSLParser.CompoundStatementContext::returnStatement)
+        .findFirst())
       .isPresent();
   }
 
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
index f905e642ceb..85ce51b7d21 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_en.properties
@@ -1,2 +1,4 @@
 diagnosticMessage=Add a check for the attribute ExchangeData.Load at the very beginning of the procedure
 diagnosticName=There is no check for the attribute DataExchange.Load in the object's event handler
+
+findFirst=Check should go first
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
index 0b0dca5dc07..f7540a19724 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
@@ -1,2 +1,4 @@
 diagnosticMessage=Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры
 diagnosticName=Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта
+
+findFirst=Проверка должна идити первой
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
index 41653ea5653..39bd6d671d9 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
@@ -26,6 +26,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;
 
@@ -36,9 +37,31 @@ class DataExchangeLoadingDiagnosticTest extends AbstractDiagnosticTest<DataExcha
 
   @Test
   void test() {
+    List<Diagnostic> diagnostics;
+    Map<String, Object> configuration;
 
-    List<Diagnostic> diagnostics = getDiagnostics();
+    // Проверяем срабатывания без изменения параметров
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
 
+    // then
+    assertThat(diagnostics)
+      .hasSize(2)
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(7, 10, 7, 22)))
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(19, 10, 19, 17)));
+
+    // Проверяем с включенным параметром findFirst
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("findFirst", true);
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
     assertThat(diagnostics)
       .hasSize(3)
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
@@ -47,6 +70,5 @@ void test() {
         Ranges.create(19, 10, 19, 17)))
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
         Ranges.create(33, 10, 33, 22)));
-
   }
 }
diff --git a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
index c943ac42539..929bc52d74f 100644
--- a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
@@ -1,5 +1,5 @@
 Процедура ПередУдалением(Отказ)
-    Если ОбменДанными.Загрузка = Истина Тогда
+    Если ОбменДанными.Загрузка Или ДополнительныеСвойства.Свойство("НеПроверятьУникальность") Тогда
         Возврат;
     КонецЕсли;
     Отказ = ОбщийМодуль.ЕстьОтказ(ОбменДанными.Загрузка);
@@ -17,7 +17,7 @@
     КонецЕсли;
 КонецПроцедуры
 
-Procedure OnWrite(Cancel)
+Procedure OnWrite(Cancel) // Ошибка
     Var Value;
     If DataExchange.Recipients Then
         Return;
@@ -35,4 +35,10 @@ Procedure BeforeDelete(Cancel)
     For Each Item in new Array Do
         Return;
     EndDo;
+
+    // Ошибка если ищем только первым
+    If DataExchange.Load Then
+        Return;
+    EndIf;
+
 EndProcedure
\ No newline at end of file

From 570ff3dd9af5ee0301dd53b4b6a9ed6eb46cd1b8 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 12:10:41 +0700
Subject: [PATCH 079/444] Precommit

---
 docs/diagnostics/DataExchangeLoading.md            | 14 +++++++++++---
 docs/diagnostics/index.md                          |  2 +-
 docs/en/diagnostics/DataExchangeLoading.md         | 14 +++++++++++---
 docs/en/diagnostics/index.md                       |  2 +-
 .../configuration/diagnostics-schema.json          | 12 ++++++++++--
 .../DataExchangeLoadingDiagnostic_ru.properties    |  2 +-
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/docs/diagnostics/DataExchangeLoading.md b/docs/diagnostics/DataExchangeLoading.md
index b792db68d54..4dde35aa74c 100644
--- a/docs/diagnostics/DataExchangeLoading.md
+++ b/docs/diagnostics/DataExchangeLoading.md
@@ -1,8 +1,14 @@
-# Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры (DataExchangeLoading)
+# Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта (DataExchangeLoading)
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Ошибка` | `BSL` | `Критичный` | `Да` | `10` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| `Ошибка` | `BSL` | `Критичный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+## Параметры 
+
+| Имя | Тип | Описание | Значение по умолчанию |
+| :-: | :-: | :-- | :-: |
+| `findFirst` | `Булево` | ```Проверка должна идти первой``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -65,5 +71,7 @@
 ### Параметр конфигурационного файла
 
 ```json
-"DataExchangeLoading": false
+"DataExchangeLoading": {
+    "findFirst": false
+}
 ```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 7037e7ad77c..e2659b87c15 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -28,7 +28,7 @@
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
diff --git a/docs/en/diagnostics/DataExchangeLoading.md b/docs/en/diagnostics/DataExchangeLoading.md
index afbeffb325a..fd29eb2c18e 100644
--- a/docs/en/diagnostics/DataExchangeLoading.md
+++ b/docs/en/diagnostics/DataExchangeLoading.md
@@ -1,8 +1,14 @@
-# Add a check for the attribute ExchangeData.Load at the very beginning of the procedure (DataExchangeLoading)
+# There is no check for the attribute DataExchange.Load in the object's event handler (DataExchangeLoading)
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Critical` | `Yes` | `10` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| `Error` | `BSL` | `Critical` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+
+## Parameters 
+
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `findFirst` | `Boolean` | ```Check should go first``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -64,5 +70,7 @@ EndProcedure
 ### Parameter for config
 
 ```json
-"DataExchangeLoading": false
+"DataExchangeLoading": {
+    "findFirst": false
+}
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 1e53873c90c..52d14d4e402 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -28,7 +28,7 @@ Total: **89**
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | Add a check for the attribute ExchangeData.Load at the very beginning of the procedure | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 660be6ebd5f..8c346966659 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -151,13 +151,21 @@
             "$id": "#/definitions/CyclomaticComplexity"
         },
         "DataExchangeLoading": {
-            "description": "Add a check for the attribute ExchangeData.Load at the very beginning of the procedure",
+            "description": "There is no check for the attribute DataExchange.Load in the object's event handler",
             "default": null,
             "type": [
                 "boolean",
                 "object"
             ],
-            "title": "Add a check for the attribute ExchangeData.Load at the very beginning of the procedure",
+            "title": "There is no check for the attribute DataExchange.Load in the object's event handler",
+            "properties": {
+                "findFirst": {
+                    "description": "Check should go first",
+                    "default": false,
+                    "type": "boolean",
+                    "title": "Check should go first"
+                }
+            },
             "$id": "#/definitions/DataExchangeLoading"
         },
         "DeletingCollectionItem": {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
index f7540a19724..b9ef05e50e5 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic_ru.properties
@@ -1,4 +1,4 @@
 diagnosticMessage=Добавьте проверку признака ОбменДанными.Загрузка в самом начале процедуры
 diagnosticName=Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта
 
-findFirst=Проверка должна идити первой
+findFirst=Проверка должна идти первой

From 2f678c57a9f4c6893e5132e1a322e2b38f65c557 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 12:23:53 +0700
Subject: [PATCH 080/444] qf

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index b0591f95470..df9278bf19e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -80,7 +80,9 @@ public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
 
   @Override
   public void configure(Map<String, Object> configuration) {
-    if (configuration == null) return;
+    if (configuration == null) {
+      return;
+    }
     DiagnosticHelper.configureDiagnostic(this, configuration, "findFirst");
   }
 
@@ -109,7 +111,7 @@ private boolean checkPassed(BSLParser.ProcDeclarationContext ctx) {
       .map(BSLParser.SubCodeBlockContext::codeBlock)
       .map(BSLParser.CodeBlockContext::statement)
       .flatMap(context -> context.stream()
-        .filter(statement -> {
+        .filter((BSLParser.StatementContext statement) -> {
           orderStatement.getAndIncrement();
           if (findFirst && orderStatement.get() > 1) {
             return false;
@@ -120,7 +122,7 @@ private boolean checkPassed(BSLParser.ProcDeclarationContext ctx) {
       .isPresent();
   }
 
-  private boolean foundLoadConditionWithReturn(BSLParser.StatementContext ctx) {
+  private static boolean foundLoadConditionWithReturn(BSLParser.StatementContext ctx) {
     return Optional.of(ctx)
       .map(BSLParser.StatementContext::compoundStatement)
       .map(BSLParser.CompoundStatementContext::ifStatement)
@@ -131,7 +133,7 @@ && foundReturnStatement(context))
       .isPresent();
   }
 
-  private boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
+  private static boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
     return Optional.of(ifBranch)
       .map(BSLParser.IfBranchContext::codeBlock)
       .map(BSLParser.CodeBlockContext::statement)
@@ -142,7 +144,7 @@ private boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
       .isPresent();
   }
 
-  private ParserRuleContext getSubContext(BSLParser.ProcDeclarationContext ctx) {
+  private static ParserRuleContext getSubContext(BSLParser.ProcDeclarationContext ctx) {
     return Trees.getAncestorByRuleIndex((ParserRuleContext) ctx.getRuleContext(), BSLParser.RULE_sub);
   }
 }

From f75f9f0e3c5753cd60cbf95798538b7d65e5e258 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 21:32:50 +0700
Subject: [PATCH 081/444] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20configure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index df9278bf19e..3af01357cfc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -78,14 +78,6 @@ public DataExchangeLoadingDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
-  @Override
-  public void configure(Map<String, Object> configuration) {
-    if (configuration == null) {
-      return;
-    }
-    DiagnosticHelper.configureDiagnostic(this, configuration, "findFirst");
-  }
-
   @Override
   public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
     Optional.of(ctx)
@@ -110,6 +102,7 @@ private boolean checkPassed(BSLParser.ProcDeclarationContext ctx) {
       .map(BSLParser.ProcedureContext::subCodeBlock)
       .map(BSLParser.SubCodeBlockContext::codeBlock)
       .map(BSLParser.CodeBlockContext::statement)
+      // FIXME: сделай этот фрагмент кода проще и лучше
       .flatMap(context -> context.stream()
         .filter((BSLParser.StatementContext statement) -> {
           orderStatement.getAndIncrement();

From 8854a67c448caacb8c868462212a8e3216ccdb72 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 22:56:12 +0700
Subject: [PATCH 082/444] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA=D0=B8=20+=20map=20to=20fla?=
 =?UTF-8?q?tmap=20(=D0=B8=D0=B7=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D1=81=D1=8F?=
 =?UTF-8?q?=20=D0=BE=D1=82=20get)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 3af01357cfc..a21afbc4362 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -28,14 +28,12 @@
 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.utils.DiagnosticHelper;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -63,7 +61,7 @@ public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
     "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private static final Pattern searchCondition = Pattern.compile(
-    "ОбменДанными.Загрузка=Истина|ОбменДанными.Загрузка|DataExchange.Load=True|DataExchange.Load",
+    "ОбменДанными\\.Загрузка=Истина|ОбменДанными\\.Загрузка|DataExchange\\.Load=True|DataExchange\\.Load",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final boolean FIND_FIRST = false;
@@ -88,8 +86,7 @@ public ParseTree visitProcDeclaration(BSLParser.ProcDeclarationContext ctx) {
       )
       .flatMap(context ->
         Optional.of(documentContext.getSymbolTree())
-          .map(symbolTree -> symbolTree.getMethodSymbol((BSLParser.SubContext) getSubContext(ctx)))
-          .get())
+          .flatMap(symbolTree -> symbolTree.getMethodSymbol((BSLParser.SubContext) getSubContext(ctx))))
       .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodSymbol.getSubNameRange()));
     return ctx;
   }

From 1e080a44e3d1d67a59551557bae9d3b60b9c6848 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Mon, 20 Apr 2020 23:04:27 +0700
Subject: [PATCH 083/444] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index a21afbc4362..377ff5df5fa 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -61,7 +61,7 @@ public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
     "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private static final Pattern searchCondition = Pattern.compile(
-    "ОбменДанными\\.Загрузка=Истина|ОбменДанными\\.Загрузка|DataExchange\\.Load=True|DataExchange\\.Load",
+    "ОбменДанными\\.Загрузка|DataExchange\\.Load",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final boolean FIND_FIRST = false;

From 6f438abe2fef9e77ee748dfca0bec222fcff46ea Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Mon, 20 Apr 2020 19:09:11 +0300
Subject: [PATCH 084/444] =?UTF-8?q?=D0=9D=D0=B5=D1=82=D0=BE=D1=87=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B8=20-=20=D0=BD=D0=B5=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D0=B5?=
 =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/LanguageServerConfiguration.java              | 2 +-
 .../diagnostics/TimeoutsInExternalResourcesDiagnostic.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
index cecc4bbc843..ad412939633 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
@@ -69,7 +69,7 @@ public final class LanguageServerConfiguration {
   private static final ComputeDiagnosticsSkipSupport DEFAULT_COMPUTE_DIAGNOSTICS_SUPPORT_VARIANT
     = ComputeDiagnosticsSkipSupport.NEVER;
 
-  private static final Pattern searchConfiguration = Pattern.compile("Configuration.(xml|mdo)$");
+  private static final Pattern searchConfiguration = Pattern.compile("Configuration\\.(xml|mdo)$");
 
   private DiagnosticLanguage diagnosticLanguage;
   private boolean showCognitiveComplexityCodeLens;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
index 7d9c8ab7ce5..6a4bfc16cbe 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
@@ -53,7 +53,7 @@
 )
 public class TimeoutsInExternalResourcesDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern PATTERN_TIMEOUT = Pattern.compile("^.(Таймаут|Timeout)",
+  private static final Pattern PATTERN_TIMEOUT = Pattern.compile("^\\.(Таймаут|Timeout)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
   private static final Pattern PATTERN_NEW_EXPRESSION = Pattern.compile(
     "^(FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection|WSОпределения|WSDefinitions|WSПрокси|WSProxy)",

From 020625675f43b2faeaea34d345c6b6ac22906b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Mon, 20 Apr 2020 22:07:28 +0300
Subject: [PATCH 085/444] =?UTF-8?q?=D0=94=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20MultilingualStringHasAllDeclar?=
 =?UTF-8?q?edLanguages=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=81=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BC=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=9D=D0=A1=D1=82=D1=80=20=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/utils/MultilingualStringAnalyser.java | 9 ++++++---
 src/test/resources/cli/test.bsl                          | 2 +-
 ...ltilingualStringHasAllDeclaredLanguagesDiagnostic.bsl | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
index b0a7c618227..a4c34ad530d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
@@ -75,7 +75,10 @@ public MultilingualStringAnalyser(String declaredLanguages) {
   }
 
   private static boolean isNotMultilingualString(BSLParser.GlobalMethodCallContext globalMethodCallContext) {
-    return !NSTR_METHOD_NAME_PATTERN.matcher(globalMethodCallContext.methodName().getText()).find();
+    String firstParameterMultilingualString = getMultilingualString(globalMethodCallContext);
+
+    return !(firstParameterMultilingualString.isEmpty() || firstParameterMultilingualString.startsWith("\""))
+      || !NSTR_METHOD_NAME_PATTERN.matcher(globalMethodCallContext.methodName().getText()).find();
   }
 
   private static boolean hasTemplateInParents(ParserRuleContext globalMethodCallContext) {
@@ -129,7 +132,7 @@ public boolean parse(BSLParser.GlobalMethodCallContext ctx) {
 
   private void expandMultilingualString() {
 
-    Matcher matcher = NSTR_LANG_PATTERN.matcher(getMultilingualString());
+    Matcher matcher = NSTR_LANG_PATTERN.matcher(getMultilingualString(this.globalMethodCallContext));
 
     while (matcher.find()) {
       Matcher cutMatcher = NSTR_LANG_CUT_PATTERN.matcher(matcher.group());
@@ -139,7 +142,7 @@ private void expandMultilingualString() {
 
   }
 
-  private String getMultilingualString() {
+  private static String getMultilingualString(BSLParser.GlobalMethodCallContext globalMethodCallContext) {
     return globalMethodCallContext.doCall().callParamList().callParam(0).getText();
   }
 
diff --git a/src/test/resources/cli/test.bsl b/src/test/resources/cli/test.bsl
index b07880b9f3c..013e3b93341 100644
--- a/src/test/resources/cli/test.bsl
+++ b/src/test/resources/cli/test.bsl
@@ -1 +1 @@
-Сообщить("Привет, мир!");
+Сообщить("Привет, мир!");
\ No newline at end of file
diff --git a/src/test/resources/diagnostics/MultilingualStringHasAllDeclaredLanguagesDiagnostic.bsl b/src/test/resources/diagnostics/MultilingualStringHasAllDeclaredLanguagesDiagnostic.bsl
index 017314c136c..cafbc817caa 100644
--- a/src/test/resources/diagnostics/MultilingualStringHasAllDeclaredLanguagesDiagnostic.bsl
+++ b/src/test/resources/diagnostics/MultilingualStringHasAllDeclaredLanguagesDiagnostic.bsl
@@ -42,4 +42,10 @@
     БыстрыйДоступПредставление = СтроковыеФункцииКлиентСервер.СтрокаСЧисломДляЛюбогоЯзыка(
         НСтр("ru = ';%1 пользователь;;%1 пользователя;%1 пользователей;%1 пользователя'"), КоличествоПользователей);
 
+    Для каждого КодЯзыка Из КодыЯзыков Цикл
+
+    	Элемент[ИмяЛокализуемогоРеквизита(ИмяРеквизита, КодЯзыка)] = НСтр(ИсходнаяСтрока, КодЯзыка);
+
+    КонецЦикла;
+
 КонецПроцелуры
\ No newline at end of file

From 592fe3920d5c16a7c7b39a03591c39dbb64d1671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Sun, 19 Apr 2020 02:06:09 +0300
Subject: [PATCH 086/444] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExcessiveAutoTestCheckDiagnostic.java     | 65 ++++++++++++++
 ...ssiveAutoTestCheckDiagnostic_en.properties |  2 +
 ...ssiveAutoTestCheckDiagnostic_ru.properties |  2 +
 .../ExcessiveAutoTestCheckDiagnosticTest.java | 30 +++++++
 .../ExcessiveAutoTestCheckDiagnostic.bsl      | 86 +++++++++++++++++++
 5 files changed, 185 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
new file mode 100644
index 00000000000..b0d56c33dcb
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -0,0 +1,65 @@
+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.parser.BSLParser;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.MINOR,
+  minutesToFix = 1,
+  modules = {
+    ModuleType.FormModule,
+    ModuleType.ObjectModule,
+    ModuleType.RecordSetModule,
+    ModuleType.CommonModule
+  },
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.DEPRECATED
+  }
+)
+public class ExcessiveAutoTestCheckDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final Pattern ERROR_EXPRESSION = Pattern.compile(
+    "(\\.Свойство\\(\"АвтоТест\"\\)|=\"АвтоТест\"|\\.Property\\(\"AutoTest\"\\)|=\"AutoTest\")$",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public ExcessiveAutoTestCheckDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitIfBranch(BSLParser.IfBranchContext ctx) {
+
+    if (expressionMatchesPattern(ctx.expression()) && codeBlockWithOnlyReturn(ctx.codeBlock())) {
+      diagnosticStorage.addDiagnostic((BSLParser.IfStatementContext) ctx.getParent());
+      return ctx;
+    }
+
+    return super.visitIfBranch(ctx);
+  }
+
+  private boolean expressionMatchesPattern(BSLParser.ExpressionContext expression) {
+    return ERROR_EXPRESSION.matcher(expression.getText()).find();
+  }
+
+  private boolean codeBlockWithOnlyReturn(BSLParser.CodeBlockContext codeBlock) {
+    return codeBlock
+      .getTokens()
+      .stream()
+      .map(t -> t.getType())
+      .filter(t -> t != BSLParser.WHITE_SPACE)
+      .filter(t -> t != BSLParser.LINE_COMMENT)
+      .filter(t -> t != BSLParser.SEMICOLON)
+      .noneMatch(t -> t != BSLParser.RETURN_KEYWORD);
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_en.properties
new file mode 100644
index 00000000000..4f5c9f199c6
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Delete parameter "AutoTest" check
+diagnosticName=Excessive AutoTest Check
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_ru.properties
new file mode 100644
index 00000000000..710d74fea0a
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Удалите проверку параметра "АвтоТест"
+diagnosticName=Избыточная проверка параметра АвтоТест
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
new file mode 100644
index 00000000000..4862264db48
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
@@ -0,0 +1,30 @@
+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 ExcessiveAutoTestCheckDiagnosticTest extends AbstractDiagnosticTest<ExcessiveAutoTestCheckDiagnostic> {
+  ExcessiveAutoTestCheckDiagnosticTest() {
+    super(ExcessiveAutoTestCheckDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(6);
+    assertThat(diagnostics, true)
+      .hasRange(3, 4, 7, 13)
+      .hasRange(14, 4, 16, 13)
+      .hasRange(22, 4, 26, 13)
+      .hasRange(46, 4, 48, 9)
+      .hasRange(54, 4, 56, 9)
+      .hasRange(62, 4, 66, 9);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl b/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl
new file mode 100644
index 00000000000..3dc0a5f7e61
--- /dev/null
+++ b/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl
@@ -0,0 +1,86 @@
+
+Процедура ПриСозданииНаСервере()
+
+    Если Параметры.Свойство("АвтоТест") Тогда // Ругаемся
+
+        Возврат;
+
+    КонецЕсли;
+
+КонецПроцедуры
+
+Процедура ОбработкаЗаполнения(ДанныеЗаполнения, ТестЗаполения, СтандартнаяОбработка)
+
+    // Пропускаем обработку, чтобы гарантировать получение формы при передаче параметра "АвтоТест"
+    Если ДанныеЗаполнения = "АвтоТест" Тогда // Ругаемся
+        Возврат;
+    КонецЕсли;
+
+КонецПроцедуры
+
+Процедура ПроверитьВыполение(Перечень)
+
+    Если Перечень.Свойство("АвтоТест") Тогда // Ругаемся так как могло быть передано из формы
+
+        Возврат;
+
+    КонецЕсли;
+
+КонецПроцедуры
+
+Процедура БезОшибок()
+
+    Перечень.Вставить("АвтоТест", "АвтоТест");
+
+    Если Перечень.Свойство("АвтоТест") Тогда // Тут не ругаемся
+
+        ВыполняемДействиеСПеречнем(Перечень);
+        Возврат;
+
+    КонецЕсли;
+
+КонецПроцедуры
+
+&AtServer
+Procedure OnCreateAtServer()
+
+    If Parameters.Property("AutoTest") Then // Issue
+        Return;
+    EndIf;
+
+EndProcedure
+
+Procedure Filling()
+
+    If VariableName = "AutoTest" Then // Issue
+        Return;
+    EndIf;
+
+EndProcedure
+
+Procedure Check(List)
+
+    If List.Property("AutoTest") Then // Issue
+
+        Return;
+
+    EndIf;
+
+EndProcedure
+
+Procedure NoError(List)
+
+    If List.Property("AutoTest") Then // No error
+
+        List.Delete("AutoTest");
+        Return;
+
+    EndIf;
+
+EndProcedure
+
+Если Отказ Тогда
+
+    Возврат;
+
+КонецЕсли;
\ No newline at end of file

From 75e42ea3c5d0636affb4cc383dcf97ba9ae83e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Mon, 20 Apr 2020 21:24:14 +0300
Subject: [PATCH 087/444] docs

---
 docs/diagnostics/ExcessiveAutoTestCheck.md    | 45 +++++++++++++++++++
 docs/en/diagnostics/ExcessiveAutoTestCheck.md | 36 +++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 docs/diagnostics/ExcessiveAutoTestCheck.md
 create mode 100644 docs/en/diagnostics/ExcessiveAutoTestCheck.md

diff --git a/docs/diagnostics/ExcessiveAutoTestCheck.md b/docs/diagnostics/ExcessiveAutoTestCheck.md
new file mode 100644
index 00000000000..577a9cd3773
--- /dev/null
+++ b/docs/diagnostics/ExcessiveAutoTestCheck.md
@@ -0,0 +1,45 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+Стандарт 772 "Взаимодействие со средствами автоматизированного тестирования" был отменен.
+В связи с этим, больше не нужна проверка параметра "АвтоТест" в коде форм.
+
+## Примеры
+```bsl
+Если Параметры.Свойство("АвтоТест") Тогда
+    Возврат;
+КонецЕсли;
+```
+
+и обработчике ОбработкаЗаполнения модуля объекта (набора записей):
+
+```bsl
+// Пропускаем обработку, чтобы гарантировать получение формы при передаче параметра "АвтоТест".
+Если ДанныеЗаполнения = "АвтоТест" Тогда
+    Возврат;
+КонецЕсли;
+```
+
+## Источники
+* Источник: [Стандарт: Тексты модулей пункт 3](https://its.1c.ru/db/v8std#content:456:hdoc:3)
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/ExcessiveAutoTestCheck.md b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
new file mode 100644
index 00000000000..4c1f1f6c135
--- /dev/null
+++ b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
@@ -0,0 +1,36 @@
+# Excessive AutoTest Check
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```

From 5a45929e363cb8db2987b6c3f7bbf69daef13135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Mon, 20 Apr 2020 22:25:34 +0300
Subject: [PATCH 088/444] precommit

---
 docs/diagnostics/ExcessiveAutoTestCheck.md    | 18 ++++++++--------
 docs/diagnostics/index.md                     |  5 +++--
 docs/en/diagnostics/ExcessiveAutoTestCheck.md | 16 +++++++-------
 docs/en/diagnostics/index.md                  |  5 +++--
 .../ExcessiveAutoTestCheckDiagnostic.java     | 21 +++++++++++++++++++
 .../configuration/diagnostics-schema.json     | 10 +++++++++
 .../languageserver/configuration/schema.json  |  3 +++
 .../ExcessiveAutoTestCheckDiagnosticTest.java | 21 +++++++++++++++++++
 8 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/docs/diagnostics/ExcessiveAutoTestCheck.md b/docs/diagnostics/ExcessiveAutoTestCheck.md
index 577a9cd3773..0ccd88ca4de 100644
--- a/docs/diagnostics/ExcessiveAutoTestCheck.md
+++ b/docs/diagnostics/ExcessiveAutoTestCheck.md
@@ -1,8 +1,8 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Избыточная проверка параметра АвтоТест (ExcessiveAutoTestCheck)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Незначительный` | `Да` | `1` | `standard`<br/>`deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -29,17 +29,17 @@
 * Источник: [Стандарт: Тексты модулей пункт 3](https://its.1c.ru/db/v8std#content:456:hdoc:3)
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:ExcessiveAutoTestCheck-off
+// BSLLS:ExcessiveAutoTestCheck-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"ExcessiveAutoTestCheck": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index e2659b87c15..a96bb0ad542 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **89**
+Общее количество: **90**
 
-* Дефект кода: **55**
+* Дефект кода: **56**
 * Уязвимость: **2**
 * Ошибка: **30**
 * Потенциальная уязвимость: **2**
@@ -38,6 +38,7 @@
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/ExcessiveAutoTestCheck.md b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
index 4c1f1f6c135..4b27bd3522b 100644
--- a/docs/en/diagnostics/ExcessiveAutoTestCheck.md
+++ b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
@@ -1,8 +1,8 @@
-# Excessive AutoTest Check
+# Excessive AutoTest Check (ExcessiveAutoTestCheck)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:ExcessiveAutoTestCheck-off
+// BSLLS:ExcessiveAutoTestCheck-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"ExcessiveAutoTestCheck": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 52d14d4e402..f0bc7a14bbe 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **89**
+Total: **90**
 
 * Error: **30**
-* Code smell: **55**
+* Code smell: **56**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -38,6 +38,7 @@ Total: **89**
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
index b0d56c33dcb..6f62abf9e05 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 8c346966659..4865d5c49a2 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -266,6 +266,16 @@
             "title": "Empty statement",
             "$id": "#/definitions/EmptyStatement"
         },
+        "ExcessiveAutoTestCheck": {
+            "description": "Excessive AutoTest Check",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Excessive AutoTest Check",
+            "$id": "#/definitions/ExcessiveAutoTestCheck"
+        },
         "ExtraCommas": {
             "description": "Commas without a parameter at the end of a method call",
             "default": null,
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 befc3db93e5..68a6a5ac293 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
@@ -164,6 +164,9 @@
                 "EmptyStatement": {
                     "$ref": "diagnostics-schema.json#/definitions/EmptyStatement"
                 },
+                "ExcessiveAutoTestCheck": {
+                    "$ref": "diagnostics-schema.json#/definitions/ExcessiveAutoTestCheck"
+                },
                 "ExtraCommas": {
                     "$ref": "diagnostics-schema.json#/definitions/ExtraCommas"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
index 4862264db48..643ea145e52 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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 fa2292ee5c9b46395e26e2e5d86dcf125eef61b4 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 09:07:37 +0300
Subject: [PATCH 089/444] begin transaction fp fix

---
 .../BeginTransactionBeforeTryCatchDiagnostic.java   | 13 ++++++++-----
 .../BeginTransactionBeforeTryCatchDiagnostic.bsl    |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
index b16e5dc3bc5..5776dc85206 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
@@ -44,7 +45,7 @@
 )
 public class BeginTransactionBeforeTryCatchDiagnostic extends AbstractVisitorDiagnostic {
   private static final Pattern BEGIN_TRANSACTION_PATTERN = Pattern.compile(
-    "НачатьТранзакцию|BeginTransaction",
+    "^НачатьТранзакцию$|^BeginTransaction$",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private BSLParserRuleContext nodeBeginTransaction;
@@ -60,10 +61,12 @@ private static boolean isGlobalMethodBeginTransaction(BSLParser.StatementContext
     if (ctx.getStart().getType() != BSLParser.IDENTIFIER) {
       return false;
     }
-    return ctx.getChildCount() > 0
-      && ctx.getChild(0).getChildCount() > 0
-      && ctx.getChild(0).getChild(0) instanceof BSLParser.GlobalMethodCallContext
-      && BEGIN_TRANSACTION_PATTERN.matcher(ctx.getText()).find();
+    return Optional.of(ctx)
+      .map(BSLParser.StatementContext::callStatement)
+      .map(BSLParser.CallStatementContext::globalMethodCall)
+      .map(BSLParser.GlobalMethodCallContext::methodName)
+      .map(methodNameContext -> BEGIN_TRANSACTION_PATTERN.matcher(methodNameContext.getText()).matches())
+      .orElse(false);
   }
 
   @Override
diff --git a/src/test/resources/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.bsl b/src/test/resources/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.bsl
index bd747c92626..c5af4eb1cff 100644
--- a/src/test/resources/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.bsl
+++ b/src/test/resources/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.bsl
@@ -102,4 +102,7 @@
 
 НачатьТранзакцию(); // <-- Ошибка: просто в конце модуля
 
-Коннектор.НачатьТранзакцию(); // Игнорируем, это не ошибка
\ No newline at end of file
+Коннектор.НачатьТранзакцию(); // Игнорируем, это не ошибка
+ОбработкаПотокаНачатьТранзакцию(); // Игнор
+BeginTransactionОбработкаПотокаНачать(); // Игнор
+ОбработкаBeginTransactionПотокаНачать(); // Игнор

From 5626489b2031972ecfd4ffc14e35554cd3bec50b Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 20 Apr 2020 22:02:55 +0300
Subject: [PATCH 090/444] DataExchangeLoadingDiagnostic npe fix

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java   |  9 +++++----
 .../diagnostics/DataExchangeLoadingDiagnostic.bsl    | 12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 377ff5df5fa..2a692d5c736 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -124,13 +124,14 @@ && foundReturnStatement(context))
   }
 
   private static boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
-    return Optional.of(ifBranch)
-      .map(BSLParser.IfBranchContext::codeBlock)
+
+    return Optional.ofNullable(ifBranch.codeBlock())
       .map(BSLParser.CodeBlockContext::statement)
-      .flatMap(context -> context.stream()
+      .flatMap(statementContexts -> statementContexts.stream()
         .map(BSLParser.StatementContext::compoundStatement)
         .map(BSLParser.CompoundStatementContext::returnStatement)
-        .findFirst())
+        .map(Optional::ofNullable)
+        .findAny())
       .isPresent();
   }
 
diff --git a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
index 929bc52d74f..37388ddc43f 100644
--- a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
@@ -41,4 +41,14 @@ Procedure BeforeDelete(Cancel)
         Return;
     EndIf;
 
-EndProcedure
\ No newline at end of file
+EndProcedure
+
+Процедура ПриЗаписи(Отказ)
+    Если ОбменДанными.Загрузка Тогда
+    	Если Не ДополнительныеСвойства.Свойство("ПропуститьОбновлениеВерсииДатЗапретаИзменения") Тогда
+    			ДатыЗапретаИзмененияСлужебный.ОбновитьВерсиюДатЗапретаИзмененияПриЗагрузкеДанных(ЭтотОбъект);
+    	КонецЕсли;
+    	Очистить();
+        Возврат;
+    КонецЕсли;
+КонецПроцедуры

From 65520bf609dc2ca91a7fd1446720564f84ac4b86 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 17 Apr 2020 00:47:31 +0300
Subject: [PATCH 091/444] CommonModuleAssignDiagnostic

---
 build.gradle.kts                              |  2 +-
 docs/diagnostics/CommonModuleAssign.md        | 40 ++++++++++
 docs/diagnostics/index.md                     |  1 +
 docs/en/diagnostics/CommonModuleAssign.md     | 36 +++++++++
 docs/en/diagnostics/index.md                  |  1 +
 .../CommonModuleAssignDiagnostic.java         | 71 ++++++++++++++++++
 .../configuration/diagnostics-schema.json     | 10 +++
 .../languageserver/configuration/schema.json  |  3 +
 ...CommonModuleAssignDiagnostic_en.properties |  2 +
 ...CommonModuleAssignDiagnostic_ru.properties |  2 +
 .../CommonModuleAssignDiagnosticTest.java     | 73 +++++++++++++++++++
 .../CommonModuleAssignDiagnostic.bsl          |  4 +
 12 files changed, 244 insertions(+), 1 deletion(-)
 create mode 100644 docs/diagnostics/CommonModuleAssign.md
 create mode 100644 docs/en/diagnostics/CommonModuleAssign.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleAssignDiagnostic.bsl

diff --git a/build.gradle.kts b/build.gradle.kts
index 6b44f06a1ca..1fcb2a6bf78 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "0.2.1")
-    implementation("com.github.1c-syntax", "mdclasses", "v0.4.2")
+    implementation("com.github.1c-syntax", "mdclasses", "907eb24da8c174e99bb9bb7d309d43d0c80fd562")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 
diff --git a/docs/diagnostics/CommonModuleAssign.md b/docs/diagnostics/CommonModuleAssign.md
new file mode 100644
index 00000000000..d984c3f3053
--- /dev/null
+++ b/docs/diagnostics/CommonModuleAssign.md
@@ -0,0 +1,40 @@
+# Присвоение общему модулю (CommonModuleAssign)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL`<br/>`OS` | `Блокирующий` | `Да` | `2` | `error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+При присвоении значения общему модулю будет вызвано исключение. 
+Такая ситуация возможна когда в конфигурацию добавляется общий модуль с 
+именем которое уже задействованном для переменной. 
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleAssign-off
+// BSLLS:CommonModuleAssign-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleAssign": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index a96bb0ad542..45529c8bdcb 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -24,6 +24,7 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
new file mode 100644
index 00000000000..3ee862696f3
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -0,0 +1,36 @@
+# CommonModuleAssign (CommonModuleAssign)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `2` | `error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleAssign-off
+// BSLLS:CommonModuleAssign-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleAssign": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index f0bc7a14bbe..3289cd3f6d4 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -24,6 +24,7 @@ Total: **90**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
new file mode 100644
index 00000000000..7186b144dc9
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
@@ -0,0 +1,71 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.parser.BSLParser;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
+import com.github._1c_syntax.mdclasses.metadata.Configuration;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import java.util.Locale;
+import java.util.Map;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.BLOCKER,
+  minutesToFix = 2,
+  tags = {
+    DiagnosticTag.ERROR
+  }
+
+)
+public class CommonModuleAssignDiagnostic extends AbstractVisitorDiagnostic {
+
+  public CommonModuleAssignDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitLValue(BSLParser.LValueContext ctx) {
+
+    TerminalNode identifier = ctx.IDENTIFIER();
+
+    if (identifier == null
+      || ctx.acceptor() != null) {
+      return ctx;
+    }
+
+    Configuration configuration = documentContext.getServerContext().getConfiguration();
+    if (configuration.commonModuleIsPresent(identifier.getText())) {
+      diagnosticStorage.addDiagnostic(identifier, info.getMessage(identifier.getText()));
+    }
+
+    return ctx;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 4865d5c49a2..08206bf8600 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -96,6 +96,16 @@
             "title": "Violating transaction rules for the 'CommitTransaction' method",
             "$id": "#/definitions/CommitTransactionOutsideTryCatch"
         },
+        "CommonModuleAssign": {
+            "description": "CommonModuleAssign",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "CommonModuleAssign",
+            "$id": "#/definitions/CommonModuleAssign"
+        },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
             "default": null,
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 68a6a5ac293..a9c9b7086c0 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
@@ -122,6 +122,9 @@
                 "CommitTransactionOutsideTryCatch": {
                     "$ref": "diagnostics-schema.json#/definitions/CommitTransactionOutsideTryCatch"
                 },
+                "CommonModuleAssign": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleAssign"
+                },
                 "CompilationDirectiveLost": {
                     "$ref": "diagnostics-schema.json#/definitions/CompilationDirectiveLost"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
new file mode 100644
index 00000000000..1a7b8febc02
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Rename variable, %s it's common module
+diagnosticName=CommonModuleAssign
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
new file mode 100644
index 00000000000..efff9745f56
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Переименуйте переменную, т.к %s это имя общего модуля
+diagnosticName=Присвоение общему модулю
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnosticTest.java
new file mode 100644
index 00000000000..32eca5b1861
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnosticTest.java
@@ -0,0 +1,73 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.metadata.Configuration;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class CommonModuleAssignDiagnosticTest extends AbstractDiagnosticTest<CommonModuleAssignDiagnostic> {
+  CommonModuleAssignDiagnosticTest() {
+    super(CommonModuleAssignDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/diagnostics/CommonModuleAssignDiagnostic.bsl";
+
+
+  @SneakyThrows
+  @Test
+  void test() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    ServerContext serverContext = new ServerContext(path);
+    Configuration configurationMetadata = serverContext.getConfiguration();
+
+
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+    DocumentContext documentContext = new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    );
+
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(3, 0, 3, 17);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CommonModuleAssignDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleAssignDiagnostic.bsl
new file mode 100644
index 00000000000..d3f389a5cc7
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleAssignDiagnostic.bsl
@@ -0,0 +1,4 @@
+
+
+А = ПервыйОбщийМодуль;
+ПервыйОбщиймодуль = 1;

From d3ad313ebe06b25e6ba2284fabde4b0140d92ff6 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 17 Apr 2020 10:24:03 +0300
Subject: [PATCH 092/444] getCommonModule is Optional

---
 build.gradle.kts                                                | 2 +-
 .../diagnostics/CommonModuleAssignDiagnostic.java               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1fcb2a6bf78..de7bf935b05 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "0.2.1")
-    implementation("com.github.1c-syntax", "mdclasses", "907eb24da8c174e99bb9bb7d309d43d0c80fd562")
+    implementation("com.github.1c-syntax", "mdclasses", "82033ffb7dd8f4b4538ac431a722e480ad83b764")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
index 7186b144dc9..8c495cd168f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
@@ -61,7 +61,7 @@ public ParseTree visitLValue(BSLParser.LValueContext ctx) {
     }
 
     Configuration configuration = documentContext.getServerContext().getConfiguration();
-    if (configuration.commonModuleIsPresent(identifier.getText())) {
+    if (configuration.getCommonModule(identifier.getText()).isPresent()) {
       diagnosticStorage.addDiagnostic(identifier, info.getMessage(identifier.getText()));
     }
 

From 40385621e49d67ca1684d2fdfeed7f71287c79b6 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 11:40:43 +0300
Subject: [PATCH 093/444] =?UTF-8?q?=D0=A3=D0=B7=D0=BE=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                              | 2 +-
 docs/diagnostics/CommonModuleAssign.md                        | 2 +-
 docs/diagnostics/index.md                                     | 4 ++--
 docs/en/diagnostics/index.md                                  | 4 ++--
 .../diagnostics/CommonModuleAssignDiagnostic.java             | 4 ----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index de7bf935b05..9704149e2b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "0.2.1")
-    implementation("com.github.1c-syntax", "mdclasses", "82033ffb7dd8f4b4538ac431a722e480ad83b764")
+    implementation("com.github.1c-syntax", "mdclasses", "86be1579c4")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 
diff --git a/docs/diagnostics/CommonModuleAssign.md b/docs/diagnostics/CommonModuleAssign.md
index d984c3f3053..500bccdfbef 100644
--- a/docs/diagnostics/CommonModuleAssign.md
+++ b/docs/diagnostics/CommonModuleAssign.md
@@ -24,8 +24,8 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 45529c8bdcb..0e68437ce24 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **90**
+Общее количество: **91**
 
 * Дефект кода: **56**
 * Уязвимость: **2**
-* Ошибка: **30**
+* Ошибка: **31**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 3289cd3f6d4..89d07016df4 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **90**
+Total: **91**
 
-* Error: **30**
+* Error: **31**
 * Code smell: **56**
 * Vulnerability: **2**
 * Security Hotspot: **2**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
index 8c495cd168f..77752bd2043 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic.java
@@ -27,14 +27,10 @@
 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.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import java.util.Locale;
-import java.util.Map;
-
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
   severity = DiagnosticSeverity.BLOCKER,

From 6da2c060a760ab730e7bdce6ee62590bd6d4cb5c Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 21 Apr 2020 14:33:48 +0300
Subject: [PATCH 094/444] Apply suggestions from code review

---
 docs/diagnostics/CommonModuleAssign.md                          | 2 +-
 .../diagnostics/CommonModuleAssignDiagnostic_en.properties      | 2 +-
 .../diagnostics/CommonModuleAssignDiagnostic_ru.properties      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/diagnostics/CommonModuleAssign.md b/docs/diagnostics/CommonModuleAssign.md
index 500bccdfbef..534c41d57d0 100644
--- a/docs/diagnostics/CommonModuleAssign.md
+++ b/docs/diagnostics/CommonModuleAssign.md
@@ -10,7 +10,7 @@
 
 При присвоении значения общему модулю будет вызвано исключение. 
 Такая ситуация возможна когда в конфигурацию добавляется общий модуль с 
-именем которое уже задействованном для переменной. 
+именем, которое уже задействовано для переменной. 
 
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
index 1a7b8febc02..ab5d844c83e 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Rename variable, %s it's common module
+diagnosticMessage=Rename variable, %s is a common module name
 diagnosticName=CommonModuleAssign
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
index efff9745f56..70083abe48b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleAssignDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Переименуйте переменную, т.к %s это имя общего модуля
+diagnosticMessage=Переименуйте переменную, т.к %s - это имя общего модуля
 diagnosticName=Присвоение общему модулю

From 9ab8e4a0fc1d2ed6f9852a69b9e347adf1925866 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Tue, 21 Apr 2020 17:50:49 +0300
Subject: [PATCH 095/444] =?UTF-8?q?=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20=D0=9F=D0=BE=D0=B4=D1=80=D1=8F?=
 =?UTF-8?q?=D0=B4=20=D0=B8=D0=B4=D1=83=D1=89=D0=B8=D0=B5=20=D0=BF=D1=83?=
 =?UTF-8?q?=D1=81=D1=82=D1=8B=D0=B5=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |   2 +-
 docs/diagnostics/ConsecutiveEmptyLines.md     |  38 +++
 docs/diagnostics/index.md                     |   5 +-
 docs/en/diagnostics/ConsecutiveEmptyLines.md  |  34 ++
 docs/en/diagnostics/index.md                  |   5 +-
 .../ConsecutiveEmptyLinesDiagnostic.java      | 133 ++++++++
 .../configuration/diagnostics-schema.json     |  18 +
 .../languageserver/configuration/schema.json  |   3 +
 ...secutiveEmptyLinesDiagnostic_en.properties |   4 +
 ...secutiveEmptyLinesDiagnostic_ru.properties |   4 +
 .../diagnostics/AbstractDiagnosticTest.java   |  20 +-
 .../ConsecutiveEmptyLinesDiagnosticTest.java  | 310 ++++++++++++++++++
 .../ConsecutiveEmptyLinesDiagnostic.bsl       |  34 ++
 13 files changed, 601 insertions(+), 9 deletions(-)
 create mode 100644 docs/diagnostics/ConsecutiveEmptyLines.md
 create mode 100644 docs/en/diagnostics/ConsecutiveEmptyLines.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/ConsecutiveEmptyLinesDiagnostic.bsl

diff --git a/build.gradle.kts b/build.gradle.kts
index 9704149e2b2..11e75582b2b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "0.14.0") {
+    implementation("com.github.1c-syntax", "bsl-parser", "01cc1512e10b667a0ec3fdd2307ca0221bf52684") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")
diff --git a/docs/diagnostics/ConsecutiveEmptyLines.md b/docs/diagnostics/ConsecutiveEmptyLines.md
new file mode 100644
index 00000000000..870d6df000d
--- /dev/null
+++ b/docs/diagnostics/ConsecutiveEmptyLines.md
@@ -0,0 +1,38 @@
+# Подряд идущие пустые строки (ConsecutiveEmptyLines)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `badpractice` |
+
+## Параметры 
+
+| Имя | Тип | Описание | Значение по умолчанию |
+| :-: | :-: | :-- | :-: |
+| `allowedEmptyLinesCount` | `Целое` | ```Максимально разрешенное количество пустых строк``` | ```1``` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Для разделения блоков кода между собой используется вставка пустой строки. 
+
+Вставка 2-х и более пустых строк не несет данной ценности и приводит к бессмысленному увеличению длины метода или модуля.
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:ConsecutiveEmptyLines-off
+// BSLLS:ConsecutiveEmptyLines-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"ConsecutiveEmptyLines": {
+  "allowedEmptyLinesCount": 1
+}
+```
+
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 0e68437ce24..6dce551df6a 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **91**
+Общее количество: **92**
 
-* Дефект кода: **56**
+* Дефект кода: **57**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
@@ -27,6 +27,7 @@
 | [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/docs/en/diagnostics/ConsecutiveEmptyLines.md b/docs/en/diagnostics/ConsecutiveEmptyLines.md
new file mode 100644
index 00000000000..d4ee1307f9a
--- /dev/null
+++ b/docs/en/diagnostics/ConsecutiveEmptyLines.md
@@ -0,0 +1,34 @@
+# Consecutive empty lines (ConsecutiveEmptyLines)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `badpractice` |
+
+## Parameters 
+
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `allowedEmptyLinesCount` | `Integer` | ```Maximum allowed consecutive empty lines``` | ```1``` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:ConsecutiveEmptyLines-off
+// BSLLS:ConsecutiveEmptyLines-on
+```
+
+### Parameter for config
+
+```json
+"ConsecutiveEmptyLines": {
+  "allowedEmptyLinesCount": 1
+}
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 89d07016df4..659c900dc05 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **91**
+Total: **92**
 
 * Error: **31**
-* Code smell: **56**
+* Code smell: **57**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -27,6 +27,7 @@ Total: **91**
 | [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
new file mode 100644
index 00000000000..8edb2e76bad
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
@@ -0,0 +1,133 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.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.languageserver.providers.CodeActionProvider;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
+import org.antlr.v4.runtime.Token;
+import org.eclipse.lsp4j.CodeAction;
+import org.eclipse.lsp4j.CodeActionParams;
+import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.TextEdit;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.BADPRACTICE
+  }
+)
+public class ConsecutiveEmptyLinesDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
+
+  private static final int DEFAULT_ALLOWED_EMPTY_LINES_COUNT = 1;
+
+  @DiagnosticParameter(
+    type = Integer.class,
+    defaultValue = "" + DEFAULT_ALLOWED_EMPTY_LINES_COUNT
+  )
+  private int allowedEmptyLinesCount = DEFAULT_ALLOWED_EMPTY_LINES_COUNT;
+
+  public ConsecutiveEmptyLinesDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  protected void check(DocumentContext documentContext) {
+
+    final var tokens = documentContext.getTokens();
+    if (tokens.isEmpty()){
+      return;
+    }
+
+    final int[] prevLineStorage = {0};
+    // без EOF, т.к. его проще и чуть быстрее обработать вне цикла
+    tokens.subList(0, tokens.size() - 1)
+      .stream()
+      .filter(token -> token.getType() != BSLLexer.WHITE_SPACE)
+      .mapToInt(Token::getLine)
+      .distinct()
+      .forEachOrdered((int currentLine) -> {
+        checkEmptyLines(currentLine - 1, prevLineStorage[0]);
+        prevLineStorage[0] = currentLine;
+      });
+
+    checkEmptyLines(getEofTokenLine(tokens), prevLineStorage[0]);
+  }
+
+  private void checkEmptyLines(int currentLine, int previousLine) {
+    if (currentLine - previousLine > allowedEmptyLinesCount){
+      addIssue(previousLine, currentLine);
+    }
+  }
+
+  private static int getEofTokenLine(List<Token> tokens) {
+    return tokens.get(tokens.size() - 1).getLine();
+  }
+
+  private void addIssue(int startEmptyLine, int lastEmptyLine) {
+    diagnosticStorage.addDiagnostic(startEmptyLine, 0, lastEmptyLine - 1, 0);
+  }
+
+  @Override
+  public List<CodeAction> getQuickFixes(
+      List<Diagnostic> diagnostics, CodeActionParams params, DocumentContext documentContext) {
+
+    var eofTokenLine = getEofTokenLine(documentContext.getTokens());
+
+    var textEdits = diagnostics.stream()
+      .map(diagnostic -> getQuickFixText(diagnostic, eofTokenLine))
+      .collect(Collectors.toList());
+
+    return CodeActionProvider.createCodeActions(
+      textEdits,
+      info.getResourceString("quickFixMessage"),
+      documentContext.getUri(),
+      diagnostics
+    );
+  }
+
+  private static TextEdit getQuickFixText(Diagnostic diagnostic, int eofTokenLine) {
+    Range range = diagnostic.getRange();
+
+    int endLine = range.getEnd().getLine() + 1;
+    String newText = "\n";
+    if (endLine == eofTokenLine){
+      endLine--;
+      newText = "";
+    }
+    Range newRange = Ranges.create(range.getStart().getLine(), 0, endLine, 0);
+    return new TextEdit(newRange, newText);
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 08206bf8600..eaebb43623e 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -126,6 +126,24 @@
             "title": "Needless compilation directive",
             "$id": "#/definitions/CompilationDirectiveNeedLess"
         },
+        "ConsecutiveEmptyLines": {
+            "description": "Consecutive empty lines",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Consecutive empty lines",
+            "properties": {
+                "allowedEmptyLinesCount": {
+                    "description": "Maximum allowed consecutive empty lines",
+                    "default": 1,
+                    "type": "integer",
+                    "title": "Maximum allowed consecutive empty lines"
+                }
+            },
+            "$id": "#/definitions/ConsecutiveEmptyLines"
+        },
         "CreateQueryInCycle": {
             "description": "Execution query on cycle",
             "default": null,
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 a9c9b7086c0..6123c084a4b 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
@@ -131,6 +131,9 @@
                 "CompilationDirectiveNeedLess": {
                     "$ref": "diagnostics-schema.json#/definitions/CompilationDirectiveNeedLess"
                 },
+                "ConsecutiveEmptyLines": {
+                    "$ref": "diagnostics-schema.json#/definitions/ConsecutiveEmptyLines"
+                },
                 "CreateQueryInCycle": {
                     "$ref": "diagnostics-schema.json#/definitions/CreateQueryInCycle"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_en.properties
new file mode 100644
index 00000000000..cfdc04aad50
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_en.properties
@@ -0,0 +1,4 @@
+diagnosticMessage=Modules must not have consecutive empty lines
+diagnosticName=Consecutive empty lines
+allowedEmptyLinesCount=Maximum allowed consecutive empty lines
+quickFixMessage=Remove consecutive empty lines
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_ru.properties
new file mode 100644
index 00000000000..614adfdbe5b
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic_ru.properties
@@ -0,0 +1,4 @@
+diagnosticMessage=Удалите лишние последовательные пустые строки
+diagnosticName=Подряд идущие пустые строки
+allowedEmptyLinesCount=Максимально разрешенное количество пустых строк
+quickFixMessage=Удалить лишние последовательные пустые строки
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
index bf5079d1bf8..faf83ef5ee8 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
@@ -63,7 +63,10 @@ protected List<Diagnostic> getDiagnostics(String simpleFileName) {
   }
 
   protected List<CodeAction> getQuickFixes(Diagnostic diagnostic) {
-    DocumentContext documentContext = getDocumentContext();
+    return getQuickFixes(diagnostic, getDocumentContext());
+  }
+
+  protected List<CodeAction> getQuickFixes(Diagnostic diagnostic, DocumentContext documentContext) {
     return getQuickFixes(documentContext, Collections.singletonList(diagnostic), diagnostic.getRange());
   }
 
@@ -101,14 +104,23 @@ protected DocumentContext getDocumentContext() {
 
   @SneakyThrows
   protected DocumentContext getDocumentContext(String SimpleFileName) {
+    String textDocumentContent = getText(SimpleFileName);
+
+    return TestUtils.getDocumentContext(textDocumentContent);
+  }
+
+  protected String getText() {
+    return getText(diagnosticInstance.getClass().getSimpleName());
+  }
+
+  @SneakyThrows
+  protected String getText(String SimpleFileName) {
     String filePath = "diagnostics/" + SimpleFileName + ".bsl";
-    String textDocumentContent = IOUtils.resourceToString(
+    return IOUtils.resourceToString(
       filePath,
       StandardCharsets.UTF_8,
       this.getClass().getClassLoader()
     );
-
-    return TestUtils.getDocumentContext(textDocumentContent);
   }
 
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnosticTest.java
new file mode 100644
index 00000000000..ef89bdcb190
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnosticTest.java
@@ -0,0 +1,310 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import org.eclipse.lsp4j.CodeAction;
+import org.eclipse.lsp4j.Diagnostic;
+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;
+
+class ConsecutiveEmptyLinesDiagnosticTest extends AbstractDiagnosticTest<ConsecutiveEmptyLinesDiagnostic> {
+  ConsecutiveEmptyLinesDiagnosticTest() {
+    super(ConsecutiveEmptyLinesDiagnostic.class);
+  }
+
+  @Test
+  void test_EmptyTwoFirstLines() {
+    String module = "  \n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 1, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyThreeFirstLines() {
+    String module = "  \n" +
+      "\n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 2, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyTwoInnerLines() {
+    String module = "Процедура Первая()\n" +
+      "\n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 0, 2, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyTwoInnerLinesWithSpaces() {
+    String module = "Процедура Первая()  \n" +
+      " \n" +
+      " \n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 0, 2, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_WorseEmptyTwoInnerLines() {
+    String module = "Процедура Первая()  \n" +
+      "  \n" +
+      "  Метод1(); //комментарии  \n" +
+      "\n" +
+      "  \n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(3, 0, 4, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyThreeInnerLines() {
+    String module = "Процедура Первая()\n" +
+      "\n" +
+      "\n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 0, 3, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyLastLines() {
+    String module = "Перем А;\n" +
+      "\n";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 0, 2, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyModule() {
+    String module = "";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasSize(0)
+    ;
+  }
+
+  @Test
+  void test_OneLine() {
+    // если в конце файла есть пустая строка и EOF, то для пользователя это выглядит как 2 пустые строки
+    // и правило должно сработать
+    String module = "\n";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 1, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_EmptyLinePlusOneFilledLine() {
+    String module = "\n//комментарий";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasSize(0)
+    ;
+  }
+
+  @Test
+  void test_ConfigureEmptyLineParam() {
+    setTwoForAllowedEmptyLinesCount();
+
+    String module = "Процедура Первая()\n" +
+      "\n" +
+      "\n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(1, 0, 3, 0)
+      .hasSize(1)
+    ;
+  }
+
+  @Test
+  void test_ConfigureEmptyLineParamNoIssue() {
+    setTwoForAllowedEmptyLinesCount();
+
+    String module = "Процедура Первая()\n" +
+      "\n" +
+      "\n" +
+      "КонецПроцедуры";
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasSize(0)
+    ;
+  }
+
+  private void setTwoForAllowedEmptyLinesCount() {
+    Map<String, Object> configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("allowedEmptyLinesCount", 2);
+    diagnosticInstance.configure(configuration);
+  }
+
+  @Test
+  void test_moduleWith_CRLF_And_Spaces() {
+    checkFileText(false);
+  }
+
+  @Test
+  void test_moduleWith_CR_And_Spaces_And_Tab() {
+    checkFileText(true);
+  }
+
+  void checkFileText(boolean use_CR_WithTab) {
+
+    String module = getText();
+
+    if (use_CR_WithTab){
+      module = module.replace("\n", "\r");
+      module = module.replace("  ", "\t");
+    }
+
+    List<Diagnostic> diagnostics = getDiagnosticsForText(module);
+
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 1, 0)
+      .hasRange(5, 0, 6, 0)
+      .hasRange(10, 0, 11, 0)
+      .hasRange(14, 0, 15, 0)
+      .hasRange(17, 0, 18, 0)
+      .hasRange(22, 0, 23, 0)
+      .hasRange(26, 0, 27, 0)
+      .hasRange(29, 0, 31, 0)
+      .hasRange(33, 0, 34, 0)
+      .hasSize(9);
+  }
+
+  @Test
+  void testQuickFix() {
+    String module = getText();
+    checkQuickFixes(module, true);
+  }
+
+  private void checkQuickFixes(String module, boolean haveFix) {
+    final DocumentContext documentContext = TestUtils.getDocumentContext(module);
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+
+    diagnostics.forEach(diagnostic -> checkFix(documentContext, diagnostic, haveFix));
+  }
+
+  @Test
+  void testQuickFixLastLines() {
+    String module = "Перем А;\n" +
+      "\n";
+    checkQuickFixes(module, true);
+  }
+
+  @Test
+  void testQuickFixEmptyModule() {
+    String module = "";
+    checkQuickFixes(module, false);
+  }
+
+  @Test
+  void testQuickFixOneLine() {
+    String module = "\n";
+    checkQuickFixes(module, true);
+  }
+
+  private void checkFix(DocumentContext documentContext, Diagnostic diagnostic, boolean haveFix) {
+    List<CodeAction> quickFixes = getQuickFixes(diagnostic, documentContext);
+
+    assertThat(quickFixes).hasSize(1);
+
+    final CodeAction quickFix = quickFixes.get(0);
+
+    if (haveFix){
+      assertThat(quickFix).of(diagnosticInstance).in(documentContext)
+        .fixes(diagnostic);
+
+      assertThat(quickFix).in(documentContext)
+        .hasChanges(1);
+    } else {
+      assertThat(quickFix).in(documentContext)
+        .hasChanges(0);
+    }
+  }
+
+  private List<Diagnostic> getDiagnosticsForText(String textDocumentContent) {
+    DocumentContext documentContext = TestUtils.getDocumentContext(textDocumentContent);
+    return getDiagnostics(documentContext);
+  }
+}
diff --git a/src/test/resources/diagnostics/ConsecutiveEmptyLinesDiagnostic.bsl b/src/test/resources/diagnostics/ConsecutiveEmptyLinesDiagnostic.bsl
new file mode 100644
index 00000000000..df679c5d832
--- /dev/null
+++ b/src/test/resources/diagnostics/ConsecutiveEmptyLinesDiagnostic.bsl
@@ -0,0 +1,34 @@
+  
+
+//Ловим в начале модуля с пробелами
+Перем Первая;
+//ловим до методов c пробелами
+
+
+Процедура Метод1()
+
+  Если Истина Тогда //не ловим с пробелами до строки кода и ловим с пробелами после строки
+
+
+  КонецЕсли;
+  //Ловим строки после
+
+
+КонецПроцедуры//ловим
+
+
+Функция Метод2()
+
+  Метод1(); //не ловим с пробелами до строки кода и ловим с пробелами после строки
+
+  
+КонецФункции
+//Ловим в теле с пробелами
+
+
+//Ловим 3 строки
+
+
+
+//Ловим в самом конце модуля
+

From 43ae7f7b3aa19bdadcf4070f29f24fa4acc65773 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 9 Apr 2020 22:07:00 +0300
Subject: [PATCH 096/444] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?=
 =?UTF-8?q?=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8.=20=D0=A0=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D0=BC=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BSLTextDocumentService.java               |  8 +-
 .../LanguageServerConfiguration.java          | 98 ++-----------------
 .../codelens/CodeLensOptions.java             | 36 +++++++
 .../ComputeTrigger.java}                      |  4 +-
 .../diagnostics/DiagnosticsOptions.java       | 47 +++++++++
 .../Language.java}                            |  8 +-
 .../SkipSupport.java}                         |  4 +-
 .../databind/RulesDeserializer.java           | 65 ++++++++++++
 .../diagnostics/DiagnosticSupplier.java       | 20 ++--
 .../diagnostics/metadata/DiagnosticInfo.java  | 17 ++--
 .../reporter/GenericIssueReport.java          |  2 +-
 .../providers/CodeLensProvider.java           |  4 +-
 .../LanguageServerConfigurationTest.java      | 24 +++--
 .../diagnostics/DiagnosticSupplierTest.java   | 16 +--
 .../languageserver/diagnostics/SmokyTest.java |  2 +-
 .../metadata/DiagnosticInfoTest.java          |  4 +-
 .../providers/CodeActionProviderTest.java     |  2 +-
 src/test/resources/.bsl-language-server.json  | 28 +++---
 18 files changed, 234 insertions(+), 155 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/{ComputeDiagnosticsTrigger.java => diagnostics/ComputeTrigger.java} (89%)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/{DiagnosticLanguage.java => diagnostics/Language.java} (84%)
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/{ComputeDiagnosticsSkipSupport.java => diagnostics/SkipSupport.java} (90%)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
index 622c76f9b47..89d0dea4e30 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
@@ -22,7 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver;
 
 import com.github._1c_syntax.bsl.languageserver.codeactions.QuickFixSupplier;
-import com.github._1c_syntax.bsl.languageserver.configuration.ComputeDiagnosticsTrigger;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.ComputeTrigger;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
@@ -227,7 +227,7 @@ public CompletableFuture<WorkspaceEdit> rename(RenameParams params) {
   @Override
   public void didOpen(DidOpenTextDocumentParams params) {
     DocumentContext documentContext = context.addDocument(params.getTextDocument());
-    if (configuration.getComputeDiagnosticsTrigger() != ComputeDiagnosticsTrigger.NEVER) {
+    if (configuration.getDiagnosticsOptions().getComputeTrigger() != ComputeTrigger.NEVER) {
       validate(documentContext);
     }
   }
@@ -244,7 +244,7 @@ public void didChange(DidChangeTextDocumentParams params) {
     diagnosticProvider.clearComputedDiagnostics(documentContext);
     documentContext.rebuild(params.getContentChanges().get(0).getText());
 
-    if (configuration.getComputeDiagnosticsTrigger() == ComputeDiagnosticsTrigger.ONTYPE) {
+    if (configuration.getDiagnosticsOptions().getComputeTrigger() == ComputeTrigger.ONTYPE) {
       validate(documentContext);
     }
   }
@@ -271,7 +271,7 @@ public void didSave(DidSaveTextDocumentParams params) {
       return;
     }
 
-    if (configuration.getComputeDiagnosticsTrigger() != ComputeDiagnosticsTrigger.NEVER) {
+    if (configuration.getDiagnosticsOptions().getComputeTrigger() != ComputeTrigger.NEVER) {
       validate(documentContext);
     }
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
index ad412939633..a57ee35516c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
@@ -23,19 +23,14 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.github._1c_syntax.bsl.languageserver.configuration.codelens.CodeLensOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -43,11 +38,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -61,41 +52,22 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public final class LanguageServerConfiguration {
 
-  public static final DiagnosticLanguage DEFAULT_DIAGNOSTIC_LANGUAGE = DiagnosticLanguage.RU;
-  private static final boolean DEFAULT_SHOW_COGNITIVE_COMPLEXITY_CODE_LENS = Boolean.TRUE;
-  private static final boolean DEFAULT_SHOW_CYCLOMATIC_COMPLEXITY_CODE_LENS = Boolean.TRUE;
-  private static final ComputeDiagnosticsTrigger DEFAULT_COMPUTE_DIAGNOSTICS_TRIGGER
-    = ComputeDiagnosticsTrigger.ONSAVE;
-  private static final ComputeDiagnosticsSkipSupport DEFAULT_COMPUTE_DIAGNOSTICS_SUPPORT_VARIANT
-    = ComputeDiagnosticsSkipSupport.NEVER;
-
   private static final Pattern searchConfiguration = Pattern.compile("Configuration\\.(xml|mdo)$");
 
-  private DiagnosticLanguage diagnosticLanguage;
-  private boolean showCognitiveComplexityCodeLens;
-  private boolean showCyclomaticComplexityCodeLens;
-  private ComputeDiagnosticsTrigger computeDiagnosticsTrigger;
-  private ComputeDiagnosticsSkipSupport computeDiagnosticsSkipSupport;
+  @JsonProperty("diagnostics")
+  private DiagnosticsOptions diagnosticsOptions;
+  @JsonProperty("codeLens")
+  private CodeLensOptions codeLensOptions;
   @Nullable
   private File traceLog;
-  @JsonDeserialize(using = LanguageServerConfiguration.DiagnosticsDeserializer.class)
-  private Map<String, Either<Boolean, Map<String, Object>>> diagnostics;
   @Nullable
   private Path configurationRoot;
 
   private LanguageServerConfiguration() {
-    this(DEFAULT_DIAGNOSTIC_LANGUAGE);
-  }
-
-  private LanguageServerConfiguration(DiagnosticLanguage diagnosticLanguage) {
     this(
-      diagnosticLanguage,
-      DEFAULT_SHOW_COGNITIVE_COMPLEXITY_CODE_LENS,
-      DEFAULT_SHOW_CYCLOMATIC_COMPLEXITY_CODE_LENS,
-      DEFAULT_COMPUTE_DIAGNOSTICS_TRIGGER,
-      DEFAULT_COMPUTE_DIAGNOSTICS_SUPPORT_VARIANT,
+      new DiagnosticsOptions(),
+      new CodeLensOptions(),
       null,
-      new HashMap<>(),
       null
     );
   }
@@ -123,10 +95,6 @@ public static LanguageServerConfiguration create() {
     return new LanguageServerConfiguration();
   }
 
-  public static LanguageServerConfiguration create(DiagnosticLanguage diagnosticLanguage) {
-    return new LanguageServerConfiguration(diagnosticLanguage);
-  }
-
   public static Path getCustomConfigurationRoot(LanguageServerConfiguration configuration, Path srcDir) {
 
     Path rootPath = null;
@@ -179,52 +147,4 @@ private static File getConfigurationFile(Path rootPath) {
     return configurationFile;
   }
 
-  static class DiagnosticsDeserializer extends JsonDeserializer<Map<String, Either<Boolean, Map<String, Object>>>> {
-
-    @Override
-    public Map<String, Either<Boolean, Map<String, Object>>> deserialize(
-      JsonParser p,
-      DeserializationContext context
-    ) throws IOException {
-
-      JsonNode diagnostics = p.getCodec().readTree(p);
-
-      if (diagnostics == null) {
-        return Collections.emptyMap();
-      }
-
-      ObjectMapper mapper = new ObjectMapper();
-      Map<String, Either<Boolean, Map<String, Object>>> diagnosticsMap = new HashMap<>();
-
-      Iterator<Map.Entry<String, JsonNode>> diagnosticsNodes = diagnostics.fields();
-      diagnosticsNodes.forEachRemaining((Map.Entry<String, JsonNode> entry) -> {
-        JsonNode diagnosticConfig = entry.getValue();
-        if (diagnosticConfig.isBoolean()) {
-          diagnosticsMap.put(entry.getKey(), Either.forLeft(diagnosticConfig.asBoolean()));
-        } else {
-          Map<String, Object> diagnosticConfiguration = getDiagnosticConfiguration(mapper, entry.getValue());
-          diagnosticsMap.put(entry.getKey(), Either.forRight(diagnosticConfiguration));
-        }
-      });
-
-      return diagnosticsMap;
-    }
-
-    private static Map<String, Object> getDiagnosticConfiguration(
-      ObjectMapper mapper,
-      JsonNode diagnosticConfig
-    ) {
-      Map<String, Object> diagnosticConfiguration;
-      try {
-        JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {});
-        diagnosticConfiguration = mapper.readValue(mapper.treeAsTokens(diagnosticConfig), type);
-      } catch (IOException e) {
-        LOGGER.error("Can't deserialize diagnostic configuration", e);
-        return null;
-      }
-      return diagnosticConfiguration;
-    }
-
-  }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
new file mode 100644
index 00000000000..f1e718b527e
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
@@ -0,0 +1,36 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.configuration.codelens;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CodeLensOptions {
+  private boolean showCognitiveComplexity = true;
+  private boolean showCyclomaticComplexity = true;
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsTrigger.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
similarity index 89%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsTrigger.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
index 338e8a49caf..ddd9171d145 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsTrigger.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
@@ -19,9 +19,9 @@
  * 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.configuration;
+package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
-public enum ComputeDiagnosticsTrigger {
+public enum ComputeTrigger {
   ONTYPE,
   ONSAVE,
   NEVER
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
new file mode 100644
index 00000000000..f33404b2c2f
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
@@ -0,0 +1,47 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.configuration.diagnostics;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.databind.RulesDeserializer;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DiagnosticsOptions {
+  private Language language = Language.RU;
+  private ComputeTrigger computeTrigger = ComputeTrigger.ONSAVE;
+  private SkipSupport skipSupport = SkipSupport.NEVER;
+  private Mode mode = Mode.ON;
+
+  @JsonDeserialize(using = RulesDeserializer.class)
+  private Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/DiagnosticLanguage.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
similarity index 84%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/DiagnosticLanguage.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
index 9937963caea..2cb62faa95f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/DiagnosticLanguage.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
@@ -19,15 +19,17 @@
  * 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.configuration;
+package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
-public enum DiagnosticLanguage {
+public enum Language {
   RU("ru"),
   EN("en");
 
+  public static final Language DEFAULT_LANGUAGE = RU;
+
   private final String languageCode;
 
-  DiagnosticLanguage(String languageCode) {
+  Language(String languageCode) {
     this.languageCode = languageCode;
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsSkipSupport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
similarity index 90%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsSkipSupport.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
index 44a40192890..3ab9bed9c69 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/ComputeDiagnosticsSkipSupport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
@@ -19,11 +19,11 @@
  * 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.configuration;
+package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public enum ComputeDiagnosticsSkipSupport {
+public enum SkipSupport {
   @JsonProperty("withSupportLocked")
   WITH_SUPPORT_LOCKED,
   @JsonProperty("withSupport")
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
new file mode 100644
index 00000000000..3d2384ab800
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
@@ -0,0 +1,65 @@
+package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.databind;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+@Slf4j
+public class RulesDeserializer extends JsonDeserializer<Map<String, Either<Boolean, Map<String, Object>>>> {
+  @Override
+  public Map<String, Either<Boolean, Map<String, Object>>> deserialize(
+    JsonParser p,
+    DeserializationContext context
+  ) throws IOException {
+
+    JsonNode diagnostics = p.getCodec().readTree(p);
+
+    if (diagnostics == null) {
+      return Collections.emptyMap();
+    }
+
+    ObjectMapper mapper = new ObjectMapper();
+    Map<String, Either<Boolean, Map<String, Object>>> diagnosticsMap = new HashMap<>();
+
+    Iterator<Map.Entry<String, JsonNode>> diagnosticsNodes = diagnostics.fields();
+    diagnosticsNodes.forEachRemaining((Map.Entry<String, JsonNode> entry) -> {
+      JsonNode diagnosticConfig = entry.getValue();
+      if (diagnosticConfig.isBoolean()) {
+        diagnosticsMap.put(entry.getKey(), Either.forLeft(diagnosticConfig.asBoolean()));
+      } else {
+        Map<String, Object> diagnosticConfiguration = getDiagnosticConfiguration(mapper, entry.getValue());
+        diagnosticsMap.put(entry.getKey(), Either.forRight(diagnosticConfiguration));
+      }
+    });
+
+    return diagnosticsMap;
+  }
+
+  private static Map<String, Object> getDiagnosticConfiguration(
+    ObjectMapper mapper,
+    JsonNode diagnosticConfig
+  ) {
+    Map<String, Object> diagnosticConfiguration;
+    try {
+      JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {});
+      diagnosticConfiguration = mapper.readValue(mapper.treeAsTokens(diagnosticConfig), type);
+    } catch (IOException e) {
+      LOGGER.error("Can't deserialize diagnostic configuration", e);
+      return null;
+    }
+    return diagnosticConfiguration;
+  }
+
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index 31eb9c99ea3..60852b5d45d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -21,7 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.ComputeDiagnosticsSkipSupport;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
@@ -68,7 +68,7 @@ public <T extends Either<String, Number>> Optional<Class<? extends BSLDiagnostic
 
   public List<BSLDiagnostic> getDiagnosticInstances(DocumentContext documentContext) {
 
-    var configuredSkipSupport = configuration.getComputeDiagnosticsSkipSupport();
+    var configuredSkipSupport = configuration.getDiagnosticsOptions().getSkipSupport();
 
     if (needToComputeDiagnostics(documentContext, configuredSkipSupport)) {
       FileType fileType = documentContext.getFileType();
@@ -94,7 +94,7 @@ public List<BSLDiagnostic> getDiagnosticInstances(DocumentContext documentContex
   }
 
   public BSLDiagnostic getDiagnosticInstance(Class<? extends BSLDiagnostic> diagnosticClass) {
-    DiagnosticInfo info = new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticLanguage());
+    DiagnosticInfo info = new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticsOptions().getLanguage());
     BSLDiagnostic diagnosticInstance = createDiagnosticInstance(info);
     configureDiagnostic(diagnosticInstance);
 
@@ -110,12 +110,12 @@ private BSLDiagnostic createDiagnosticInstance(DiagnosticInfo diagnosticInfo) {
   }
 
   private DiagnosticInfo createDiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass) {
-    return new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticLanguage());
+    return new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticsOptions().getLanguage());
   }
 
   private void configureDiagnostic(BSLDiagnostic diagnostic) {
     Either<Boolean, Map<String, Object>> diagnosticConfiguration =
-      configuration.getDiagnostics().get(diagnostic.getInfo().getCode().getStringValue());
+      configuration.getDiagnosticsOptions().getRules().get(diagnostic.getInfo().getCode().getStringValue());
 
     if (diagnosticConfiguration != null && diagnosticConfiguration.isRight()) {
       diagnostic.configure(diagnosticConfiguration.getRight());
@@ -128,7 +128,7 @@ private boolean isEnabled(DiagnosticInfo diagnosticInfo) {
     }
 
     Either<Boolean, Map<String, Object>> diagnosticConfiguration =
-      configuration.getDiagnostics().get(diagnosticInfo.getCode().getStringValue());
+      configuration.getDiagnosticsOptions().getRules().get(diagnosticInfo.getCode().getStringValue());
 
     boolean activatedByDefault = diagnosticConfiguration == null && diagnosticInfo.isActivatedByDefault();
     boolean hasCustomConfiguration = diagnosticConfiguration != null && diagnosticConfiguration.isRight();
@@ -192,9 +192,9 @@ private static boolean passedCompatibilityMode(
 
   private static boolean needToComputeDiagnostics(
     DocumentContext documentContext,
-    ComputeDiagnosticsSkipSupport configuredSkipSupport
+    SkipSupport configuredSkipSupport
   ) {
-    if (configuredSkipSupport == ComputeDiagnosticsSkipSupport.NEVER) {
+    if (configuredSkipSupport == SkipSupport.NEVER) {
       return true;
     }
 
@@ -207,11 +207,11 @@ private static boolean needToComputeDiagnostics(
       return true;
     }
 
-    if (configuredSkipSupport == ComputeDiagnosticsSkipSupport.WITH_SUPPORT_LOCKED) {
+    if (configuredSkipSupport == SkipSupport.WITH_SUPPORT_LOCKED) {
       return moduleSupportVariant != SupportVariant.NOT_EDITABLE;
     }
 
-    return configuredSkipSupport != ComputeDiagnosticsSkipSupport.WITH_SUPPORT;
+    return configuredSkipSupport != SkipSupport.WITH_SUPPORT;
   }
 
   @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
index aeafee2ec08..f2abcdb78d9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
@@ -21,8 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics.metadata;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.DiagnosticLanguage;
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
 import com.github._1c_syntax.bsl.languageserver.utils.UTF8Control;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
@@ -42,6 +41,8 @@
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
+import static com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.DEFAULT_LANGUAGE;
+
 @Slf4j
 public class DiagnosticInfo {
 
@@ -49,15 +50,15 @@ public class DiagnosticInfo {
     = createSeverityToLSPSeverityMap();
 
   private final Class<? extends BSLDiagnostic> diagnosticClass;
-  private final DiagnosticLanguage diagnosticLanguage;
+  private final Language language;
 
   private final DiagnosticCode diagnosticCode;
   private final DiagnosticMetadata diagnosticMetadata;
   private final List<DiagnosticParameterInfo> diagnosticParameters;
 
-  public DiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass, DiagnosticLanguage diagnosticLanguage) {
+  public DiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass, Language language) {
     this.diagnosticClass = diagnosticClass;
-    this.diagnosticLanguage = diagnosticLanguage;
+    this.language = language;
 
     diagnosticCode = createDiagnosticCode();
     diagnosticMetadata = diagnosticClass.getAnnotation(DiagnosticMetadata.class);
@@ -65,7 +66,7 @@ public DiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass, Diagnostic
   }
 
   public DiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass) {
-    this(diagnosticClass, LanguageServerConfiguration.DEFAULT_DIAGNOSTIC_LANGUAGE);
+    this(diagnosticClass, DEFAULT_LANGUAGE);
   }
 
   public Class<? extends BSLDiagnostic> getDiagnosticClass() {
@@ -81,7 +82,7 @@ public String getName() {
   }
 
   public String getDescription() {
-    String langCode = diagnosticLanguage.getLanguageCode();
+    String langCode = language.getLanguageCode();
 
     String resourceName = langCode + "/" + diagnosticCode.getStringValue() + ".md";
     InputStream descriptionStream = diagnosticClass.getResourceAsStream(resourceName);
@@ -108,7 +109,7 @@ public String getMessage(Object... args) {
   }
 
   public String getResourceString(String key) {
-    String languageCode = diagnosticLanguage.getLanguageCode();
+    String languageCode = language.getLanguageCode();
     Locale locale = Locale.forLanguageTag(languageCode);
     return ResourceBundle.getBundle(diagnosticClass.getName(), locale, new UTF8Control()).getString(key).intern();
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
index 8ddb97aca14..1d75e6d8957 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
@@ -141,7 +141,7 @@ public GenericIssueEntry(String fileName, Diagnostic diagnostic) {
       Optional<Class<? extends BSLDiagnostic>> diagnosticClass =
         diagnosticSupplier.getDiagnosticClass(diagnostic.getCode());
       if (diagnosticClass.isPresent()) {
-        DiagnosticInfo info = new DiagnosticInfo(diagnosticClass.get(), configuration.getDiagnosticLanguage());
+        DiagnosticInfo info = new DiagnosticInfo(diagnosticClass.get(), configuration.getDiagnosticsOptions().getLanguage());
         effortMinutes = info.getMinutesToFix();
       } else {
         effortMinutes = 0;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java
index d531b19d6ab..8acdaaeb5e2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeLensProvider.java
@@ -49,7 +49,7 @@ public List<CodeLens> getCodeLens(DocumentContext documentContext) {
   private List<CodeLens> getCognitiveComplexityCodeLenses(DocumentContext documentContext) {
     List<CodeLens> codeLenses = new ArrayList<>();
 
-    if (configuration.isShowCognitiveComplexityCodeLens()) {
+    if (configuration.getCodeLensOptions().isShowCognitiveComplexity()) {
       Map<MethodSymbol, Integer> methodsComplexity = documentContext.getCognitiveComplexityData()
         .getMethodsComplexity();
 
@@ -72,7 +72,7 @@ private List<CodeLens> getCognitiveComplexityCodeLenses(DocumentContext document
   private List<CodeLens> getCyclomaticComplexityCodeLenses(DocumentContext documentContext) {
     List<CodeLens> codeLenses = new ArrayList<>();
 
-    if (configuration.isShowCyclomaticComplexityCodeLens()) {
+    if (configuration.getCodeLensOptions().isShowCyclomaticComplexity()) {
 
       Map<MethodSymbol, Integer> methodsComplexity = documentContext.getCyclomaticComplexityData()
         .getMethodsComplexity();
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index 74b92647c3d..5dc538510b0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -21,6 +21,8 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
 import com.github._1c_syntax.utils.Absolute;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.junit.jupiter.api.BeforeEach;
@@ -34,7 +36,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-import static com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration.DEFAULT_DIAGNOSTIC_LANGUAGE;
+import static com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.DEFAULT_LANGUAGE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class LanguageServerConfigurationTest {
@@ -58,8 +60,8 @@ void createDefault() {
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create();
 
     // then
-    assertThat(configuration.getDiagnosticLanguage()).isEqualTo(DiagnosticLanguage.RU);
-    assertThat(configuration.getDiagnostics()).isEmpty();
+    assertThat(configuration.getDiagnosticsOptions().getLanguage()).isEqualTo(com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.RU);
+    assertThat(configuration.getDiagnosticsOptions().getRules()).isEmpty();
   }
 
   @Test
@@ -72,10 +74,11 @@ void createFromFile() {
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
 
     // then
-    DiagnosticLanguage diagnosticLanguage = configuration.getDiagnosticLanguage();
-    Map<String, Either<Boolean, Map<String, Object>>> diagnostics = configuration.getDiagnostics();
+    DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
+    Language language = diagnosticsOptions.getLanguage();
+    Map<String, Either<Boolean, Map<String, Object>>> diagnostics = diagnosticsOptions.getRules();
 
-    assertThat(diagnosticLanguage).isEqualTo(DiagnosticLanguage.EN);
+    assertThat(language).isEqualTo(Language.EN);
     assertThat(diagnostics).hasSize(2);
 
     Either<Boolean, Map<String, Object>> lineLength = diagnostics.get("LineLength");
@@ -104,11 +107,12 @@ void createFromEmptyFile() {
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
 
     // then
-    DiagnosticLanguage diagnosticLanguage = configuration.getDiagnosticLanguage();
-    Map<String, Either<Boolean, Map<String, Object>>> diagnostics = configuration.getDiagnostics();
+    DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
+    Language language = diagnosticsOptions.getLanguage();
+    Map<String, Either<Boolean, Map<String, Object>>> rules = diagnosticsOptions.getRules();
 
-    assertThat(diagnosticLanguage).isEqualTo(DEFAULT_DIAGNOSTIC_LANGUAGE);
-    assertThat(diagnostics).isEmpty();
+    assertThat(language).isEqualTo(DEFAULT_LANGUAGE);
+    assertThat(rules).isEmpty();
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
index c6f27e23d80..d6964ef00c4 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
@@ -21,8 +21,8 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.ComputeDiagnosticsSkipSupport;
-import com.github._1c_syntax.bsl.languageserver.configuration.DiagnosticLanguage;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
@@ -236,7 +236,7 @@ void testSkipSupport() {
     var supportConfiguration = mock(SupportConfiguration.class);
 
     // when-then pairs ComputeDiagnosticsSkipSupport.NEVER
-    lsConfiguration.setComputeDiagnosticsSkipSupport(ComputeDiagnosticsSkipSupport.NEVER);
+    lsConfiguration.getDiagnosticsOptions().setSkipSupport(SkipSupport.NEVER);
     when(documentContext.getSupportVariants()).thenReturn(Collections.emptyMap());
     assertThat(diagnosticSupplier.getDiagnosticInstances(documentContext))
       .isNotEmpty();
@@ -258,7 +258,7 @@ void testSkipSupport() {
       .isNotEmpty();
 
     // when-then pairs ComputeDiagnosticsSkipSupport.WITHSUPPORTLOCKED
-    lsConfiguration.setComputeDiagnosticsSkipSupport(ComputeDiagnosticsSkipSupport.WITH_SUPPORT_LOCKED);
+    lsConfiguration.getDiagnosticsOptions().setSkipSupport(SkipSupport.WITH_SUPPORT_LOCKED);
     when(documentContext.getSupportVariants()).thenReturn(Collections.emptyMap());
     assertThat(diagnosticSupplier.getDiagnosticInstances(documentContext))
       .isNotEmpty();
@@ -280,7 +280,7 @@ void testSkipSupport() {
       .isEmpty();
 
     // when-then pairs ComputeDiagnosticsSkipSupport.WITHSUPPORT
-    lsConfiguration.setComputeDiagnosticsSkipSupport(ComputeDiagnosticsSkipSupport.WITH_SUPPORT);
+    lsConfiguration.getDiagnosticsOptions().setSkipSupport(SkipSupport.WITH_SUPPORT);
     when(documentContext.getSupportVariants()).thenReturn(Collections.emptyMap());
     assertThat(diagnosticSupplier.getDiagnosticInstances(documentContext))
       .isNotEmpty();
@@ -304,15 +304,15 @@ void testSkipSupport() {
 
   @Test
   void TestAllParametersHaveResourcesRU() {
-    allParametersHaveResources(DiagnosticLanguage.RU);
+    allParametersHaveResources(Language.RU);
   }
 
   @Test
   void TestAllParametersHaveResourcesEN() {
-    allParametersHaveResources(DiagnosticLanguage.EN);
+    allParametersHaveResources(com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.EN);
   }
 
-  void allParametersHaveResources(DiagnosticLanguage language) {
+  void allParametersHaveResources(Language language) {
 
     // when
     List<Class<? extends BSLDiagnostic>> diagnosticClasses = DiagnosticSupplier.getDiagnosticClasses();
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
index f6b8fa41d04..0854e7f3ba1 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
@@ -101,7 +101,7 @@ void testIAllDiagnostics() {
 
     // создадим новый конфиг, в котором включим все диагностики
     var configuration = LanguageServerConfiguration.create();
-    configuration.setDiagnostics(diagnostics);
+    configuration.getDiagnosticsOptions().setRules(diagnostics);
     var diagnosticSupplier = new DiagnosticSupplier(configuration);
 
     // для каждой фикстуры расчитаем диагностики
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
index d420c101df0..bffc629fb7c 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
@@ -21,7 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics.metadata;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.DiagnosticLanguage;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.EmptyCodeBlockDiagnostic;
 import org.assertj.core.api.Assertions;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
@@ -74,7 +74,7 @@ void testParameter() {
   @Test
   void testParameterEn() {
 
-    DiagnosticInfo diagnosticEnInfo = new DiagnosticInfo(EmptyCodeBlockDiagnostic.class, DiagnosticLanguage.EN);
+    DiagnosticInfo diagnosticEnInfo = new DiagnosticInfo(EmptyCodeBlockDiagnostic.class, Language.EN);
     assertThat(diagnosticEnInfo.getParameters().get(0).getDescription())
       .isEqualTo("Comment as code");
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
index 243d03d179c..21fc4136fe0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
@@ -62,7 +62,7 @@ void testGetCodeActions() throws IOException {
     DiagnosticProvider diagnosticProvider = new DiagnosticProvider(diagnosticSupplier);
     List<Diagnostic> diagnostics = diagnosticProvider.computeDiagnostics(documentContext).stream()
       .filter(diagnostic -> {
-        DiagnosticInfo diagnosticInfo = new DiagnosticInfo(CanonicalSpellingKeywordsDiagnostic.class, configuration.getDiagnosticLanguage());
+        DiagnosticInfo diagnosticInfo = new DiagnosticInfo(CanonicalSpellingKeywordsDiagnostic.class, configuration.getDiagnosticsOptions().getLanguage());
         DiagnosticCode diagnosticCode = diagnosticInfo.getCode();
         return diagnostic.getCode().equals(diagnosticCode);
       })
diff --git a/src/test/resources/.bsl-language-server.json b/src/test/resources/.bsl-language-server.json
index 3434bcb7ad7..6c4f92b2808 100644
--- a/src/test/resources/.bsl-language-server.json
+++ b/src/test/resources/.bsl-language-server.json
@@ -1,15 +1,19 @@
 {
-  "diagnosticLanguage": "en",
-  "showCognitiveComplexityCodeLens": true,
-  "showCyclomaticComplexityCodeLens": true,
-  "computeDiagnosticsTrigger": "onType",
-  "computeDiagnosticsSkipSupport": "withSupportLocked",
-  "traceLog": "build/.trace.log",
-  "configurationRoot": "src/test/resources/metadata",
+  "codeLens": {
+    "showCognitiveComplexity": true,
+    "showCyclomaticComplexity": true
+  },
   "diagnostics": {
-    "LineLength": {
-      "maxLineLength": 140
-    },
-    "MethodSize": false
-  }
+    "language": "en",
+    "computeTrigger": "onType",
+    "skipSupport": "withSupportLocked",
+    "rules": {
+      "LineLength": {
+        "maxLineLength": 140
+      },
+      "MethodSize": false
+    }
+  },
+  "traceLog": "build/.trace.log",
+  "configurationRoot": "src/test/resources/metadata"
 }

From 8111a3d8f1a1250e28079b125e2257780a432a4f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 9 Apr 2020 22:11:58 +0300
Subject: [PATCH 097/444] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=B4=20DiagnosticMode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/diagnostics/Mode.java       | 30 +++++++++++++++++++
 src/test/resources/.bsl-language-server.json  |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
new file mode 100644
index 00000000000..8905050ce03
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
@@ -0,0 +1,30 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.configuration.diagnostics;
+
+public enum Mode {
+  OFF,
+  ON,
+  EXCEPT,
+  ONLY,
+  ALL
+}
diff --git a/src/test/resources/.bsl-language-server.json b/src/test/resources/.bsl-language-server.json
index 6c4f92b2808..6d960a0dd56 100644
--- a/src/test/resources/.bsl-language-server.json
+++ b/src/test/resources/.bsl-language-server.json
@@ -7,6 +7,7 @@
     "language": "en",
     "computeTrigger": "onType",
     "skipSupport": "withSupportLocked",
+    "mode": "only",
     "rules": {
       "LineLength": {
         "maxLineLength": 140

From 1e1dc318590a5369d6ca45e5e44e1a26a28b9f5a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 9 Apr 2020 23:08:49 +0300
Subject: [PATCH 098/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=83=D1=87=D0=B5=D1=82=20=D1=80=D0=B5=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DiagnosticSupplier.java       |  40 +++++--
 .../diagnostics/DiagnosticSupplierTest.java   | 103 +++++++++++++++++-
 2 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index 60852b5d45d..dfd16450f1e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -21,6 +21,8 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Mode;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
@@ -68,9 +70,9 @@ public <T extends Either<String, Number>> Optional<Class<? extends BSLDiagnostic
 
   public List<BSLDiagnostic> getDiagnosticInstances(DocumentContext documentContext) {
 
-    var configuredSkipSupport = configuration.getDiagnosticsOptions().getSkipSupport();
+    DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
 
-    if (needToComputeDiagnostics(documentContext, configuredSkipSupport)) {
+    if (needToComputeDiagnostics(documentContext, diagnosticsOptions)) {
       FileType fileType = documentContext.getFileType();
       CompatibilityMode compatibilityMode = documentContext
         .getServerContext()
@@ -80,7 +82,7 @@ public List<BSLDiagnostic> getDiagnosticInstances(DocumentContext documentContex
 
       return diagnosticClasses.stream()
         .map(this::createDiagnosticInfo)
-        .filter(this::isEnabled)
+        .filter(diagnosticInfo -> isEnabled(diagnosticInfo, diagnosticsOptions))
         .filter(info -> inScope(info, fileType))
         .filter(info -> correctModuleType(info, moduleType, fileType))
         .filter(info -> passedCompatibilityMode(info, compatibilityMode))
@@ -122,11 +124,16 @@ private void configureDiagnostic(BSLDiagnostic diagnostic) {
     }
   }
 
-  private boolean isEnabled(DiagnosticInfo diagnosticInfo) {
+  private boolean isEnabled(DiagnosticInfo diagnosticInfo, DiagnosticsOptions diagnosticsOptions) {
     if (diagnosticInfo == null) {
       return false;
     }
 
+    var mode = diagnosticsOptions.getMode();
+    if (mode == Mode.OFF) {
+      return false;
+    }
+
     Either<Boolean, Map<String, Object>> diagnosticConfiguration =
       configuration.getDiagnosticsOptions().getRules().get(diagnosticInfo.getCode().getStringValue());
 
@@ -135,10 +142,19 @@ private boolean isEnabled(DiagnosticInfo diagnosticInfo) {
     boolean enabledDirectly = diagnosticConfiguration != null
       && diagnosticConfiguration.isLeft()
       && diagnosticConfiguration.getLeft();
+    boolean hasDefinedSetting = enabledDirectly || hasCustomConfiguration;
+
+    boolean passedAllMode = mode == Mode.ALL;
+    boolean passedOnlyMode = mode == Mode.ONLY && hasDefinedSetting;
+    boolean passedExcept = mode == Mode.EXCEPT && !hasDefinedSetting;
+    boolean passedOn = mode == Mode.ON && (activatedByDefault || hasDefinedSetting);
+
+    return passedOn
+      || passedAllMode
+      || passedOnlyMode
+      || passedExcept
+    ;
 
-    return activatedByDefault
-      || hasCustomConfiguration
-      || enabledDirectly;
   }
 
   private static boolean inScope(DiagnosticInfo diagnosticInfo, FileType fileType) {
@@ -192,8 +208,16 @@ private static boolean passedCompatibilityMode(
 
   private static boolean needToComputeDiagnostics(
     DocumentContext documentContext,
-    SkipSupport configuredSkipSupport
+    DiagnosticsOptions diagnosticsOptions
   ) {
+    var configuredMode = diagnosticsOptions.getMode();
+
+    if (configuredMode == Mode.OFF) {
+      return false;
+    }
+
+    var configuredSkipSupport = diagnosticsOptions.getSkipSupport();
+
     if (configuredSkipSupport == SkipSupport.NEVER) {
       return true;
     }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
index d6964ef00c4..6edb6586ad6 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
@@ -21,9 +21,10 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Mode;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
@@ -33,10 +34,12 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.CompatibilityMode;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.SupportVariant;
+import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
@@ -307,6 +310,104 @@ void TestAllParametersHaveResourcesRU() {
     allParametersHaveResources(Language.RU);
   }
 
+  @Test
+  void testDiagnosticModeOff() {
+    // given
+    var lsConfiguration = LanguageServerConfiguration.create();
+    var documentContext = TestUtils.getDocumentContext("");
+    diagnosticSupplier = new DiagnosticSupplier(lsConfiguration);
+
+    // when-then pairs
+    lsConfiguration.getDiagnosticsOptions().setMode(Mode.OFF);
+    List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
+
+    assertThat(diagnostics).isEmpty();
+  }
+
+  @Test
+  void testDiagnosticModeOn() {
+    // given
+    var lsConfiguration = LanguageServerConfiguration.create();
+    var documentContext = TestUtils.getDocumentContext("");
+    diagnosticSupplier = new DiagnosticSupplier(lsConfiguration);
+
+    // when
+    lsConfiguration.getDiagnosticsOptions().setMode(Mode.ON);
+    List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
+
+    assertThat(diagnostics)
+      .hasSizeGreaterThan(10)
+      .flatExtracting(Object::getClass)
+      .doesNotContain(TooManyReturnsDiagnostic.class);
+  }
+
+  @Test
+  void testDiagnosticModeAll() {
+    // given
+    var lsConfiguration = LanguageServerConfiguration.create();
+    var documentContext = TestUtils.getDocumentContext("");
+    diagnosticSupplier = new DiagnosticSupplier(lsConfiguration);
+
+    // when
+    lsConfiguration.getDiagnosticsOptions().setMode(Mode.ALL);
+    List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
+
+    assertThat(diagnostics)
+      .hasSizeGreaterThan(10)
+      .flatExtracting(Object::getClass)
+      .contains(TooManyReturnsDiagnostic.class);
+  }
+
+  @Test
+  void testDiagnosticModeOnly() {
+    // given
+    var lsConfiguration = LanguageServerConfiguration.create();
+    var documentContext = TestUtils.getDocumentContext("");
+    diagnosticSupplier = new DiagnosticSupplier(lsConfiguration);
+
+    // when
+    lsConfiguration.getDiagnosticsOptions().setMode(Mode.ONLY);
+    Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
+    rules.put("Typo", Either.forLeft(true));
+    rules.put("TooManyReturns", Either.forLeft(true));
+
+    lsConfiguration.getDiagnosticsOptions().setRules(rules);
+    List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
+
+    assertThat(diagnostics)
+      .hasSize(2)
+      .flatExtracting(Object::getClass)
+      .contains(TypoDiagnostic.class)
+      .contains(TooManyReturnsDiagnostic.class)
+    ;
+  }
+
+  @Test
+  void testDiagnosticModeExcept() {
+    // given
+    var lsConfiguration = LanguageServerConfiguration.create();
+    var documentContext = TestUtils.getDocumentContext("");
+    diagnosticSupplier = new DiagnosticSupplier(lsConfiguration);
+
+    // when
+    lsConfiguration.getDiagnosticsOptions().setMode(Mode.EXCEPT);
+    Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
+    rules.put("Typo", Either.forLeft(true));
+    rules.put("TooManyReturns", Either.forLeft(true));
+
+    lsConfiguration.getDiagnosticsOptions().setRules(rules);
+    List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
+
+    assertThat(diagnostics)
+      .hasSizeGreaterThan(10)
+      .flatExtracting(Object::getClass)
+      .doesNotContain(TypoDiagnostic.class)
+      .doesNotContain(TooManyReturnsDiagnostic.class)
+      .contains(TernaryOperatorUsageDiagnostic.class)
+      .contains(EmptyRegionDiagnostic.class)
+    ;
+  }
+
   @Test
   void TestAllParametersHaveResourcesEN() {
     allParametersHaveResources(com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.EN);

From b792b0952c3a1641227e0273f18d984829072bdb Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 9 Apr 2020 23:12:02 +0300
Subject: [PATCH 099/444] Fix QF

---
 .../databind/RulesDeserializer.java           | 21 +++++++++++++++++++
 .../reporter/GenericIssueReport.java          |  4 +++-
 .../LanguageServerConfigurationTest.java      |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
index 3d2384ab800..b8b91412013 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.configuration.diagnostics.databind;
 
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
index 1d75e6d8957..4b44d12bbdf 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
@@ -141,7 +141,9 @@ public GenericIssueEntry(String fileName, Diagnostic diagnostic) {
       Optional<Class<? extends BSLDiagnostic>> diagnosticClass =
         diagnosticSupplier.getDiagnosticClass(diagnostic.getCode());
       if (diagnosticClass.isPresent()) {
-        DiagnosticInfo info = new DiagnosticInfo(diagnosticClass.get(), configuration.getDiagnosticsOptions().getLanguage());
+        DiagnosticInfo info = new DiagnosticInfo(
+          diagnosticClass.get(), configuration.getDiagnosticsOptions().getLanguage()
+        );
         effortMinutes = info.getMinutesToFix();
       } else {
         effortMinutes = 0;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index 5dc538510b0..9375dc627cb 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -60,7 +60,7 @@ void createDefault() {
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create();
 
     // then
-    assertThat(configuration.getDiagnosticsOptions().getLanguage()).isEqualTo(com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.RU);
+    assertThat(configuration.getDiagnosticsOptions().getLanguage()).isEqualTo(Language.RU);
     assertThat(configuration.getDiagnosticsOptions().getRules()).isEmpty();
   }
 

From 805fc51b91015f1f260e8fc6f5862ba20e3b20d1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 11 Apr 2020 21:32:43 +0300
Subject: [PATCH 100/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20javadoc=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LanguageServerConfiguration.java          | 13 +++++++--
 .../codelens/CodeLensOptions.java             |  3 ++
 .../configuration/codelens/package-info.java  | 26 +++++++++++++++++
 .../diagnostics/ComputeTrigger.java           | 14 ++++++++++
 .../diagnostics/DiagnosticsOptions.java       |  3 ++
 .../configuration/diagnostics/Language.java   | 20 +++++++++++++
 .../configuration/diagnostics/Mode.java       | 28 +++++++++++++++++++
 .../diagnostics/SkipSupport.java              | 14 ++++++++++
 .../databind/RulesDeserializer.java           |  6 ++++
 .../diagnostics/package-info.java             | 25 +++++++++++++++++
 .../configuration/package-info.java           |  9 ++++++
 11 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/package-info.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/package-info.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
index a57ee35516c..4c65916fd39 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
@@ -46,6 +46,12 @@
 
 import static com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS;
 
+/**
+ * Корневой класс конфигурации BSL Language Server.
+ * <p>
+ * В обычном режиме работы провайдеры и прочие классы могут расчитывать на единственность объекта конфигурации
+ * и безопасно сохранять ссылку на конфигурацию или ее части.
+ */
 @Data
 @AllArgsConstructor(onConstructor = @__({@JsonCreator(mode = JsonCreator.Mode.DISABLED)}))
 @Slf4j
@@ -55,11 +61,14 @@ public final class LanguageServerConfiguration {
   private static final Pattern searchConfiguration = Pattern.compile("Configuration\\.(xml|mdo)$");
 
   @JsonProperty("diagnostics")
-  private DiagnosticsOptions diagnosticsOptions;
+  private final DiagnosticsOptions diagnosticsOptions;
+
   @JsonProperty("codeLens")
-  private CodeLensOptions codeLensOptions;
+  private final CodeLensOptions codeLensOptions;
+
   @Nullable
   private File traceLog;
+
   @Nullable
   private Path configurationRoot;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
index f1e718b527e..7b0eab8ee15 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
@@ -26,6 +26,9 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * Корневой класс для настройки {@link com.github._1c_syntax.bsl.languageserver.providers.CodeLensProvider}
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/package-info.java
new file mode 100644
index 00000000000..8648ddebe11
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.
+ */
+
+/**
+ * Пакет содержит настройки {@link com.github._1c_syntax.bsl.languageserver.providers.CodeLensProvider}
+ */
+package com.github._1c_syntax.bsl.languageserver.configuration.codelens;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
index ddd9171d145..10e1ab8f05e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/ComputeTrigger.java
@@ -21,8 +21,22 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
+/**
+ * Триггер для запуска процедуры расчета диагностик.
+ */
 public enum ComputeTrigger {
+  /**
+   * При редактировании файла
+   */
   ONTYPE,
+
+  /**
+   * При сохранении файла
+   */
   ONSAVE,
+  
+  /**
+   * Никогда
+   */
   NEVER
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
index f33404b2c2f..8ff9defbde9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
@@ -32,6 +32,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Корневой класс для настройки {@link com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider}
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
index 2cb62faa95f..23843bedad5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
@@ -21,18 +21,38 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
+/**
+ * Язык для имен, сообщеий и прочих ресурсов диагностик.
+ */
 public enum Language {
+
+  /**
+   * Русский
+   */
   RU("ru"),
+
+  /**
+   * Английский
+   */
   EN("en");
 
+  /**
+   * Язык по умолчанию
+   */
   public static final Language DEFAULT_LANGUAGE = RU;
 
   private final String languageCode;
 
+  /**
+   * @param languageCode код языка в соответствии с {@link java.util.Locale#getLanguage()}
+   */
   Language(String languageCode) {
     this.languageCode = languageCode;
   }
 
+  /**
+   * @return код языка в соответствии с {@link java.util.Locale#getLanguage()}
+   */
   public String getLanguageCode() {
     return languageCode;
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
index 8905050ce03..45658504dc5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
@@ -21,10 +21,38 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
+
+/**
+ * Режим для учета настроек правил.
+ * <p/>
+ * См. {@link DiagnosticsOptions#getRules()}
+ */
 public enum Mode {
+
+  /**
+   * Все диагностики считаются выключенными.
+   */
   OFF,
+
+  /**
+   * Все диагностики, включенные по умолчанию ({@link DiagnosticMetadata#activatedByDefault()}, считаются включенными.
+   * Остальные - в соответствии с конфигурацией настроек правил.
+   */
   ON,
+
+  /**
+   * Все диагностики, кроме указанных в конфигурации настроек правил, считаются включенными.
+   */
   EXCEPT,
+
+  /**
+   * Только диагностики, указанные в конфигурации настроек правил, считаются включенными.
+   */
   ONLY,
+
+  /**
+   * Все диагностики считаются включенными.
+   */
   ALL
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
index 3ab9bed9c69..b4aeb02bbc8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SkipSupport.java
@@ -23,11 +23,25 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/**
+ * Режим пропуска подсчета диагностик в зависимости от режима поддержки модуля
+ */
 public enum SkipSupport {
+  /**
+   * Пропуск файлов на поддержке без возможности изменения.
+   */
   @JsonProperty("withSupportLocked")
   WITH_SUPPORT_LOCKED,
+
+  /**
+   * Пропуск файлов на поддержке без возможности изменения и с возможностью изменения с сохранением поддержки.
+   */
   @JsonProperty("withSupport")
   WITH_SUPPORT,
+
+  /**
+   * Никогда не пропускать файлы.
+   */
   @JsonProperty("never")
   NEVER
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
index b8b91412013..32725eb8518 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
@@ -37,8 +37,14 @@
 import java.util.Iterator;
 import java.util.Map;
 
+/**
+ * Служебный класс-десериализатор для коллекции настроек диагностик.
+ * <p>
+ * См. {@link com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions#getRules()}
+ */
 @Slf4j
 public class RulesDeserializer extends JsonDeserializer<Map<String, Either<Boolean, Map<String, Object>>>> {
+
   @Override
   public Map<String, Either<Boolean, Map<String, Object>>> deserialize(
     JsonParser p,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/package-info.java
new file mode 100644
index 00000000000..551a8d4fb84
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.
+ */
+/**
+ * Пакет содержит настройки для работы {@link com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider}
+ */
+package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/package-info.java
index 6073c9c265f..f1f647eb85c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/package-info.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/package-info.java
@@ -19,4 +19,13 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with BSL Language Server.
  */
+
+/**
+ * В пакете содержатся классы для конфигурирования BSL Language Server.
+ * <p>
+ * Корневой пакет содержит корневой класс конфигурации
+ * {@link com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration}
+ * , настройки верхнего уровня и дополнительные пакеты для настроек в разрезе провайдеров
+ * (диагностики, code lens, и т.д.)
+ */
 package com.github._1c_syntax.bsl.languageserver.configuration;

From bb6ccbd0004c21a9b2a8c7864f535d6d87d4318a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 11 Apr 2020 21:55:18 +0300
Subject: [PATCH 101/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BA=D0=B8=20json-=D1=81=D1=85=D0=B5=D0=BC=D1=8B=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D1=83=20=D0=BA=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/developer-tools.gradle.kts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gradle/developer-tools.gradle.kts b/gradle/developer-tools.gradle.kts
index ce9e392a296..b8e116cde21 100644
--- a/gradle/developer-tools.gradle.kts
+++ b/gradle/developer-tools.gradle.kts
@@ -55,11 +55,21 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
 
     private fun createDiagnosticSupplier(lang: String, classLoader: ClassLoader) : Any {
         val languageServerConfigurationClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration")
-        val diagnosticLanguageClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.DiagnosticLanguage")
-        val lsConfiguration = languageServerConfigurationClass.getDeclaredMethod("create", diagnosticLanguageClass)
-                .invoke(languageServerConfigurationClass,
-                        diagnosticLanguageClass.getMethod("valueOf", classLoader.loadClass("java.lang.String"))
-                                .invoke(diagnosticLanguageClass, lang.toUpperCase()))
+        val diagnosticsOptionsClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions")
+        val languageClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language")
+
+        val lsConfiguration = languageServerConfigurationClass
+                .getDeclaredMethod("create")
+                .invoke(languageServerConfigurationClass)
+        val language = languageClass.getMethod("valueOf", classLoader.loadClass("java.lang.String"))
+                .invoke(languageClass, lang.toUpperCase())
+        val diagnosticOptions = languageServerConfigurationClass
+                .getDeclaredMethod("getDiagnosticsOptions")
+                .invoke(lsConfiguration)
+
+        diagnosticsOptionsClass.getDeclaredMethod("setLanguage", languageClass)
+                .invoke(diagnosticOptions, language)
+
         return classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier").declaredConstructors[0].newInstance(lsConfiguration)
     }
 

From 185293cf6fd07a863a66919a0fdd09140a81f12a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 11:27:24 +0300
Subject: [PATCH 102/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=20language=20=D0=B8=D0=B7=20DiagnosticOptions=20=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B9=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20bsl=20ls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Language перестал быть только языком диагностик - он используется для квик-фиксов, возможно скоро начнет использоваться и в codelens. Теперь это общий язык для взаимодействия бсл лс с пользователем
---
 gradle/developer-tools.gradle.kts                      | 10 +++-------
 .../configuration/{diagnostics => }/Language.java      |  5 +++--
 .../configuration/LanguageServerConfiguration.java     |  3 +++
 .../configuration/diagnostics/DiagnosticsOptions.java  |  1 -
 .../languageserver/diagnostics/DiagnosticSupplier.java |  4 ++--
 .../diagnostics/metadata/DiagnosticInfo.java           |  4 ++--
 .../diagnostics/reporter/GenericIssueReport.java       |  2 +-
 .../configuration/LanguageServerConfigurationTest.java |  9 ++++-----
 .../diagnostics/DiagnosticSupplierTest.java            |  4 ++--
 .../diagnostics/metadata/DiagnosticInfoTest.java       |  2 +-
 .../providers/CodeActionProviderTest.java              |  5 ++++-
 src/test/resources/.bsl-language-server.json           |  2 +-
 12 files changed, 26 insertions(+), 25 deletions(-)
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/{diagnostics => }/Language.java (86%)

diff --git a/gradle/developer-tools.gradle.kts b/gradle/developer-tools.gradle.kts
index b8e116cde21..9edc83a1fec 100644
--- a/gradle/developer-tools.gradle.kts
+++ b/gradle/developer-tools.gradle.kts
@@ -55,20 +55,16 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
 
     private fun createDiagnosticSupplier(lang: String, classLoader: ClassLoader) : Any {
         val languageServerConfigurationClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration")
-        val diagnosticsOptionsClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions")
-        val languageClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language")
+        val languageClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.Language")
 
         val lsConfiguration = languageServerConfigurationClass
                 .getDeclaredMethod("create")
                 .invoke(languageServerConfigurationClass)
         val language = languageClass.getMethod("valueOf", classLoader.loadClass("java.lang.String"))
                 .invoke(languageClass, lang.toUpperCase())
-        val diagnosticOptions = languageServerConfigurationClass
-                .getDeclaredMethod("getDiagnosticsOptions")
-                .invoke(lsConfiguration)
 
-        diagnosticsOptionsClass.getDeclaredMethod("setLanguage", languageClass)
-                .invoke(diagnosticOptions, language)
+        languageServerConfigurationClass.getDeclaredMethod("setLanguage", languageClass)
+                .invoke(lsConfiguration, language)
 
         return classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier").declaredConstructors[0].newInstance(lsConfiguration)
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/Language.java
similarity index 86%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/Language.java
index 23843bedad5..fea03dbdaee 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Language.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/Language.java
@@ -19,10 +19,11 @@
  * 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.configuration.diagnostics;
+package com.github._1c_syntax.bsl.languageserver.configuration;
 
 /**
- * Язык для имен, сообщеий и прочих ресурсов диагностик.
+ * Язык для сообщений, ресурсов и прочих взаимододействий между
+ * BSL Language Server и пользователем.
  */
 public enum Language {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
index 4c65916fd39..ca9aa5ee0d8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
@@ -60,6 +60,8 @@ public final class LanguageServerConfiguration {
 
   private static final Pattern searchConfiguration = Pattern.compile("Configuration\\.(xml|mdo)$");
 
+  private Language language;
+
   @JsonProperty("diagnostics")
   private final DiagnosticsOptions diagnosticsOptions;
 
@@ -74,6 +76,7 @@ public final class LanguageServerConfiguration {
 
   private LanguageServerConfiguration() {
     this(
+      Language.DEFAULT_LANGUAGE,
       new DiagnosticsOptions(),
       new CodeLensOptions(),
       null,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
index 8ff9defbde9..3f53dec9e38 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
@@ -40,7 +40,6 @@
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DiagnosticsOptions {
-  private Language language = Language.RU;
   private ComputeTrigger computeTrigger = ComputeTrigger.ONSAVE;
   private SkipSupport skipSupport = SkipSupport.NEVER;
   private Mode mode = Mode.ON;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index dfd16450f1e..5413ca5e49f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -96,7 +96,7 @@ public List<BSLDiagnostic> getDiagnosticInstances(DocumentContext documentContex
   }
 
   public BSLDiagnostic getDiagnosticInstance(Class<? extends BSLDiagnostic> diagnosticClass) {
-    DiagnosticInfo info = new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticsOptions().getLanguage());
+    DiagnosticInfo info = new DiagnosticInfo(diagnosticClass, configuration.getLanguage());
     BSLDiagnostic diagnosticInstance = createDiagnosticInstance(info);
     configureDiagnostic(diagnosticInstance);
 
@@ -112,7 +112,7 @@ private BSLDiagnostic createDiagnosticInstance(DiagnosticInfo diagnosticInfo) {
   }
 
   private DiagnosticInfo createDiagnosticInfo(Class<? extends BSLDiagnostic> diagnosticClass) {
-    return new DiagnosticInfo(diagnosticClass, configuration.getDiagnosticsOptions().getLanguage());
+    return new DiagnosticInfo(diagnosticClass, configuration.getLanguage());
   }
 
   private void configureDiagnostic(BSLDiagnostic diagnostic) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
index f2abcdb78d9..5e9ecbe2977 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
@@ -21,7 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics.metadata;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
 import com.github._1c_syntax.bsl.languageserver.utils.UTF8Control;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
@@ -41,7 +41,7 @@
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
-import static com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.DEFAULT_LANGUAGE;
+import static com.github._1c_syntax.bsl.languageserver.configuration.Language.DEFAULT_LANGUAGE;
 
 @Slf4j
 public class DiagnosticInfo {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
index 4b44d12bbdf..d842176d88f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericIssueReport.java
@@ -142,7 +142,7 @@ public GenericIssueEntry(String fileName, Diagnostic diagnostic) {
         diagnosticSupplier.getDiagnosticClass(diagnostic.getCode());
       if (diagnosticClass.isPresent()) {
         DiagnosticInfo info = new DiagnosticInfo(
-          diagnosticClass.get(), configuration.getDiagnosticsOptions().getLanguage()
+          diagnosticClass.get(), configuration.getLanguage()
         );
         effortMinutes = info.getMinutesToFix();
       } else {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index 9375dc627cb..c353f518c58 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -22,7 +22,6 @@
 package com.github._1c_syntax.bsl.languageserver.configuration;
 
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
 import com.github._1c_syntax.utils.Absolute;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,7 +35,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-import static com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.DEFAULT_LANGUAGE;
+import static com.github._1c_syntax.bsl.languageserver.configuration.Language.DEFAULT_LANGUAGE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class LanguageServerConfigurationTest {
@@ -60,7 +59,7 @@ void createDefault() {
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create();
 
     // then
-    assertThat(configuration.getDiagnosticsOptions().getLanguage()).isEqualTo(Language.RU);
+    assertThat(configuration.getLanguage()).isEqualTo(Language.RU);
     assertThat(configuration.getDiagnosticsOptions().getRules()).isEmpty();
   }
 
@@ -75,7 +74,7 @@ void createFromFile() {
 
     // then
     DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
-    Language language = diagnosticsOptions.getLanguage();
+    Language language = configuration.getLanguage();
     Map<String, Either<Boolean, Map<String, Object>>> diagnostics = diagnosticsOptions.getRules();
 
     assertThat(language).isEqualTo(Language.EN);
@@ -108,7 +107,7 @@ void createFromEmptyFile() {
 
     // then
     DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
-    Language language = diagnosticsOptions.getLanguage();
+    Language language = configuration.getLanguage();
     Map<String, Either<Boolean, Map<String, Object>>> rules = diagnosticsOptions.getRules();
 
     assertThat(language).isEqualTo(DEFAULT_LANGUAGE);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
index 6edb6586ad6..4d0c6802d28 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
@@ -22,7 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Mode;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
@@ -410,7 +410,7 @@ void testDiagnosticModeExcept() {
 
   @Test
   void TestAllParametersHaveResourcesEN() {
-    allParametersHaveResources(com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language.EN);
+    allParametersHaveResources(Language.EN);
   }
 
   void allParametersHaveResources(Language language) {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
index bffc629fb7c..e2d4f0895bc 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfoTest.java
@@ -21,7 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics.metadata;
 
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.EmptyCodeBlockDiagnostic;
 import org.assertj.core.api.Assertions;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
index 21fc4136fe0..e7a2a864830 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
@@ -62,7 +62,10 @@ void testGetCodeActions() throws IOException {
     DiagnosticProvider diagnosticProvider = new DiagnosticProvider(diagnosticSupplier);
     List<Diagnostic> diagnostics = diagnosticProvider.computeDiagnostics(documentContext).stream()
       .filter(diagnostic -> {
-        DiagnosticInfo diagnosticInfo = new DiagnosticInfo(CanonicalSpellingKeywordsDiagnostic.class, configuration.getDiagnosticsOptions().getLanguage());
+        DiagnosticInfo diagnosticInfo = new DiagnosticInfo(
+          CanonicalSpellingKeywordsDiagnostic.class,
+          configuration.getLanguage()
+        );
         DiagnosticCode diagnosticCode = diagnosticInfo.getCode();
         return diagnostic.getCode().equals(diagnosticCode);
       })
diff --git a/src/test/resources/.bsl-language-server.json b/src/test/resources/.bsl-language-server.json
index 6d960a0dd56..fb1ecdff4a6 100644
--- a/src/test/resources/.bsl-language-server.json
+++ b/src/test/resources/.bsl-language-server.json
@@ -1,10 +1,10 @@
 {
+  "language": "en",
   "codeLens": {
     "showCognitiveComplexity": true,
     "showCyclomaticComplexity": true
   },
   "diagnostics": {
-    "language": "en",
     "computeTrigger": "onType",
     "skipSupport": "withSupportLocked",
     "mode": "only",

From bee702e8f8ba786d7e770403039c479b45d3fe0e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 12:30:11 +0300
Subject: [PATCH 103/444] rules -> parameters

---
 .../diagnostics/DiagnosticsOptions.java            |  6 +++---
 .../configuration/diagnostics/Mode.java            |  2 +-
 ...serializer.java => ParametersDeserializer.java} |  4 ++--
 .../diagnostics/DiagnosticSupplier.java            |  4 ++--
 .../LanguageServerConfigurationTest.java           | 14 +++++++-------
 .../diagnostics/DiagnosticSupplierTest.java        |  4 ++--
 .../bsl/languageserver/diagnostics/SmokyTest.java  |  2 +-
 src/test/resources/.bsl-language-server.json       |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/{RulesDeserializer.java => ParametersDeserializer.java} (95%)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
index 3f53dec9e38..2cbee0dde56 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
@@ -23,7 +23,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.databind.RulesDeserializer;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.databind.ParametersDeserializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -44,6 +44,6 @@ public class DiagnosticsOptions {
   private SkipSupport skipSupport = SkipSupport.NEVER;
   private Mode mode = Mode.ON;
 
-  @JsonDeserialize(using = RulesDeserializer.class)
-  private Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
+  @JsonDeserialize(using = ParametersDeserializer.class)
+  private Map<String, Either<Boolean, Map<String, Object>>> parameters = new HashMap<>();
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
index 45658504dc5..7e2ab869aea 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
@@ -26,7 +26,7 @@
 /**
  * Режим для учета настроек правил.
  * <p/>
- * См. {@link DiagnosticsOptions#getRules()}
+ * См. {@link DiagnosticsOptions#getParameters()}
  */
 public enum Mode {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/ParametersDeserializer.java
similarity index 95%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/ParametersDeserializer.java
index 32725eb8518..1ff23ece5a7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/RulesDeserializer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/databind/ParametersDeserializer.java
@@ -40,10 +40,10 @@
 /**
  * Служебный класс-десериализатор для коллекции настроек диагностик.
  * <p>
- * См. {@link com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions#getRules()}
+ * См. {@link com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions#getParameters()}
  */
 @Slf4j
-public class RulesDeserializer extends JsonDeserializer<Map<String, Either<Boolean, Map<String, Object>>>> {
+public class ParametersDeserializer extends JsonDeserializer<Map<String, Either<Boolean, Map<String, Object>>>> {
 
   @Override
   public Map<String, Either<Boolean, Map<String, Object>>> deserialize(
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index 5413ca5e49f..02058ea6ce1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -117,7 +117,7 @@ private DiagnosticInfo createDiagnosticInfo(Class<? extends BSLDiagnostic> diagn
 
   private void configureDiagnostic(BSLDiagnostic diagnostic) {
     Either<Boolean, Map<String, Object>> diagnosticConfiguration =
-      configuration.getDiagnosticsOptions().getRules().get(diagnostic.getInfo().getCode().getStringValue());
+      configuration.getDiagnosticsOptions().getParameters().get(diagnostic.getInfo().getCode().getStringValue());
 
     if (diagnosticConfiguration != null && diagnosticConfiguration.isRight()) {
       diagnostic.configure(diagnosticConfiguration.getRight());
@@ -135,7 +135,7 @@ private boolean isEnabled(DiagnosticInfo diagnosticInfo, DiagnosticsOptions diag
     }
 
     Either<Boolean, Map<String, Object>> diagnosticConfiguration =
-      configuration.getDiagnosticsOptions().getRules().get(diagnosticInfo.getCode().getStringValue());
+      configuration.getDiagnosticsOptions().getParameters().get(diagnosticInfo.getCode().getStringValue());
 
     boolean activatedByDefault = diagnosticConfiguration == null && diagnosticInfo.isActivatedByDefault();
     boolean hasCustomConfiguration = diagnosticConfiguration != null && diagnosticConfiguration.isRight();
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index c353f518c58..b903401b556 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -60,7 +60,7 @@ void createDefault() {
 
     // then
     assertThat(configuration.getLanguage()).isEqualTo(Language.RU);
-    assertThat(configuration.getDiagnosticsOptions().getRules()).isEmpty();
+    assertThat(configuration.getDiagnosticsOptions().getParameters()).isEmpty();
   }
 
   @Test
@@ -75,19 +75,19 @@ void createFromFile() {
     // then
     DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
     Language language = configuration.getLanguage();
-    Map<String, Either<Boolean, Map<String, Object>>> diagnostics = diagnosticsOptions.getRules();
+    Map<String, Either<Boolean, Map<String, Object>>> parameters = diagnosticsOptions.getParameters();
 
     assertThat(language).isEqualTo(Language.EN);
-    assertThat(diagnostics).hasSize(2);
+    assertThat(parameters).hasSize(2);
 
-    Either<Boolean, Map<String, Object>> lineLength = diagnostics.get("LineLength");
+    Either<Boolean, Map<String, Object>> lineLength = parameters.get("LineLength");
     assertThat(lineLength.isRight()).isTrue();
     assertThat(lineLength.getRight()).isInstanceOfAny(Map.class);
     assertThat(lineLength.getRight())
       .extracting(stringObjectMap -> stringObjectMap.get("maxLineLength"))
       .isEqualTo(140);
 
-    Either<Boolean, Map<String, Object>> methodSize = diagnostics.get("MethodSize");
+    Either<Boolean, Map<String, Object>> methodSize = parameters.get("MethodSize");
     assertThat(methodSize.isLeft()).isTrue();
     assertThat(methodSize.getLeft()).isEqualTo(false);
 
@@ -108,10 +108,10 @@ void createFromEmptyFile() {
     // then
     DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
     Language language = configuration.getLanguage();
-    Map<String, Either<Boolean, Map<String, Object>>> rules = diagnosticsOptions.getRules();
+    Map<String, Either<Boolean, Map<String, Object>>> parameters = diagnosticsOptions.getParameters();
 
     assertThat(language).isEqualTo(DEFAULT_LANGUAGE);
-    assertThat(rules).isEmpty();
+    assertThat(parameters).isEmpty();
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
index 4d0c6802d28..ab3dc740032 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
@@ -371,7 +371,7 @@ void testDiagnosticModeOnly() {
     rules.put("Typo", Either.forLeft(true));
     rules.put("TooManyReturns", Either.forLeft(true));
 
-    lsConfiguration.getDiagnosticsOptions().setRules(rules);
+    lsConfiguration.getDiagnosticsOptions().setParameters(rules);
     List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
 
     assertThat(diagnostics)
@@ -395,7 +395,7 @@ void testDiagnosticModeExcept() {
     rules.put("Typo", Either.forLeft(true));
     rules.put("TooManyReturns", Either.forLeft(true));
 
-    lsConfiguration.getDiagnosticsOptions().setRules(rules);
+    lsConfiguration.getDiagnosticsOptions().setParameters(rules);
     List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
 
     assertThat(diagnostics)
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
index 0854e7f3ba1..d819c29cbfe 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SmokyTest.java
@@ -101,7 +101,7 @@ void testIAllDiagnostics() {
 
     // создадим новый конфиг, в котором включим все диагностики
     var configuration = LanguageServerConfiguration.create();
-    configuration.getDiagnosticsOptions().setRules(diagnostics);
+    configuration.getDiagnosticsOptions().setParameters(diagnostics);
     var diagnosticSupplier = new DiagnosticSupplier(configuration);
 
     // для каждой фикстуры расчитаем диагностики
diff --git a/src/test/resources/.bsl-language-server.json b/src/test/resources/.bsl-language-server.json
index fb1ecdff4a6..b06e9d59b29 100644
--- a/src/test/resources/.bsl-language-server.json
+++ b/src/test/resources/.bsl-language-server.json
@@ -8,7 +8,7 @@
     "computeTrigger": "onType",
     "skipSupport": "withSupportLocked",
     "mode": "only",
-    "rules": {
+    "parameters": {
       "LineLength": {
         "maxLineLength": 140
       },

From c72c26cee6c6bfd7de59b2911324b3311b055935 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 13 Apr 2020 22:38:59 +0300
Subject: [PATCH 104/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20json-schema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ics-schema.json => parameters-schema.json} |   4 +-
 .../languageserver/configuration/schema.json  | 400 ++++++++++--------
 2 files changed, 229 insertions(+), 175 deletions(-)
 rename src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/{diagnostics-schema.json => parameters-schema.json} (99%)

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json
similarity index 99%
rename from src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
rename to src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json
index eaebb43623e..1820ff1f817 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json
@@ -1,8 +1,8 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "http://example.com/root.json",
+    "$id": "https://1c-syntax.github.io/bsl-language-server/configuration/parameters-schema.json",
     "type": "object",
-    "title": "BSL Language Server Configuration File. Diagnostic definition part",
+    "title": "BSL Language Server Configuration File. Parameters definition part",
     "definitions": {
         "BeginTransactionBeforeTryCatch": {
             "description": "Violating transaction rules for the 'BeginTransaction' method",
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 6123c084a4b..4f1a26da95a 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
@@ -1,383 +1,437 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "http://example.com/root.json",
+    "$id": "https://1c-syntax.github.io/bsl-language-server/configuration/schema.json",
     "type": "object",
     "title": "BSL Language Server Configuration File.",
+    "additionalItems": false,
     "definitions": {
-        "Diagnostic": {
-            "$id": "#/definitions/Diagnostic",
+        "parameter": {
+            "$id": "#/definitions/parameter",
             "type": [
                 "boolean",
                 "object"
             ],
-            "title": "Concrete diagnostic configuration.\nCan be boolean for turning on/off or object.",
+            "title": "Concrete diagnostic parameters' configuration.\nCan be boolean for turning on/off or object.",
             "default": true
-        }
-    },
-    "properties": {
-        "diagnosticLanguage": {
-            "$id": "#/properties/diagnosticLanguage",
-            "type": "string",
-            "oneOf": [
-                {
-                    "const": "en",
-                    "description": "English"
-                },
-                {
-                    "const": "ru",
-                    "description": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439 (russian)"
-                }
-            ],
-            "title": "Diagnostics text language.",
-            "default": "ru"
-        },
-        "showCognitiveComplexityCodeLens": {
-            "$id": "#/properties/showCognitiveComplexityCodeLens",
-            "type": "boolean",
-            "title": "Show cognitive complexity score above method definition (codeLens).",
-            "default": true
-        },
-        "showCyclomaticComplexityCodeLens": {
-            "$id": "#/properties/showCyclomaticComplexityCodeLens",
-            "type": "boolean",
-            "title": "Show cyclomatic complexity score above method definition (codeLens).",
-            "default": true
-        },
-        "computeDiagnosticsTrigger": {
-            "$id": "#/properties/computeDiagnosticsTrigger",
-            "type": "string",
-            "oneOf": [
-                {
-                    "const": "onSave",
-                    "description": "Compute on save"
-                },
-                {
-                    "const": "onType",
-                    "description": "Compute on type (edit file)"
-                },
-                {
-                    "const": "never",
-                    "description": "Never compute"
-                }
-            ],
-            "title": "Trigger for the computation of diagnostics.",
-            "default": "onSave"
-        },
-        "computeDiagnosticsSkipSupport": {
-            "$id": "#/properties/computeDiagnosticsSkipSupport",
-            "type": "string",
-            "oneOf": [
-                {
-                    "const": "withSupport",
-                    "description": "Skip computing diagnostics on modules with any kind of support."
-                },
-                {
-                    "const": "withSupportLocked",
-                    "description": "Skip computing diagnostics on modules with `not editable` support mode."
-                },
-                {
-                    "const": "never",
-                    "description": "Never skip computing."
-                }
-            ],
-            "title": "Analyze module support variant and skip all diagnostics if necessary.",
-            "default": "never"
-        },
-        "traceLog": {
-            "$id": "#/properties/traceLog",
-            "type": "string",
-            "title": "Path to file to log all inbound and outbound requests between BSL Language Server and Language Client from used IDE.\nCan be absolute or relative (to the project root). If set *significantly slows down* communication speed between server and client.",
-            "default": "",
-            "examples": [
-                ".trace.log"
-            ]
         },
-        "diagnostics": {
-            "$id": "#/properties/diagnostics",
+        "parameters": {
+            "$id": "#/definitions/parameters",
             "type": "object",
-            "title": "Diagnostics configuration.\nKey-value object, where key is a diagnosticCode, and value is boolean or object with concrete diagnostic configuration.",
+            "title": "Diagnostics parameters configuration.\nKey-value object, where key is a diagnosticCode, and value is boolean or object with concrete diagnostic configuration.",
             "default": null,
             "additionalProperties": {
-                "$ref": "#/definitions/Diagnostic"
+                "$ref": "#/definitions/parameter"
             },
             "properties": {
                 "BeginTransactionBeforeTryCatch": {
-                    "$ref": "diagnostics-schema.json#/definitions/BeginTransactionBeforeTryCatch"
+                    "$ref": "parameters-schema.json#/definitions/BeginTransactionBeforeTryCatch"
                 },
                 "CanonicalSpellingKeywords": {
-                    "$ref": "diagnostics-schema.json#/definitions/CanonicalSpellingKeywords"
+                    "$ref": "parameters-schema.json#/definitions/CanonicalSpellingKeywords"
                 },
                 "CodeBlockBeforeSub": {
-                    "$ref": "diagnostics-schema.json#/definitions/CodeBlockBeforeSub"
+                    "$ref": "parameters-schema.json#/definitions/CodeBlockBeforeSub"
                 },
                 "CodeOutOfRegion": {
-                    "$ref": "diagnostics-schema.json#/definitions/CodeOutOfRegion"
+                    "$ref": "parameters-schema.json#/definitions/CodeOutOfRegion"
                 },
                 "CognitiveComplexity": {
-                    "$ref": "diagnostics-schema.json#/definitions/CognitiveComplexity"
+                    "$ref": "parameters-schema.json#/definitions/CognitiveComplexity"
                 },
                 "CommentedCode": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommentedCode"
+                    "$ref": "parameters-schema.json#/definitions/CommentedCode"
                 },
                 "CommitTransactionOutsideTryCatch": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommitTransactionOutsideTryCatch"
+                    "$ref": "parameters-schema.json#/definitions/CommitTransactionOutsideTryCatch"
                 },
                 "CommonModuleAssign": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleAssign"
                 },
                 "CompilationDirectiveLost": {
-                    "$ref": "diagnostics-schema.json#/definitions/CompilationDirectiveLost"
+                    "$ref": "parameters-schema.json#/definitions/CompilationDirectiveLost"
                 },
                 "CompilationDirectiveNeedLess": {
-                    "$ref": "diagnostics-schema.json#/definitions/CompilationDirectiveNeedLess"
+                    "$ref": "parameters-schema.json#/definitions/CompilationDirectiveNeedLess"
                 },
                 "ConsecutiveEmptyLines": {
                     "$ref": "diagnostics-schema.json#/definitions/ConsecutiveEmptyLines"
                 },
                 "CreateQueryInCycle": {
-                    "$ref": "diagnostics-schema.json#/definitions/CreateQueryInCycle"
+                    "$ref": "parameters-schema.json#/definitions/CreateQueryInCycle"
                 },
                 "CyclomaticComplexity": {
-                    "$ref": "diagnostics-schema.json#/definitions/CyclomaticComplexity"
+                    "$ref": "parameters-schema.json#/definitions/CyclomaticComplexity"
                 },
                 "DataExchangeLoading": {
                     "$ref": "diagnostics-schema.json#/definitions/DataExchangeLoading"
                 },
                 "DeletingCollectionItem": {
-                    "$ref": "diagnostics-schema.json#/definitions/DeletingCollectionItem"
+                    "$ref": "parameters-schema.json#/definitions/DeletingCollectionItem"
                 },
                 "DeprecatedCurrentDate": {
-                    "$ref": "diagnostics-schema.json#/definitions/DeprecatedCurrentDate"
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedCurrentDate"
                 },
                 "DeprecatedFind": {
-                    "$ref": "diagnostics-schema.json#/definitions/DeprecatedFind"
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedFind"
                 },
                 "DeprecatedMessage": {
-                    "$ref": "diagnostics-schema.json#/definitions/DeprecatedMessage"
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedMessage"
                 },
                 "DeprecatedTypeManagedForm": {
-                    "$ref": "diagnostics-schema.json#/definitions/DeprecatedTypeManagedForm"
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedTypeManagedForm"
                 },
                 "DuplicateRegion": {
-                    "$ref": "diagnostics-schema.json#/definitions/DuplicateRegion"
+                    "$ref": "parameters-schema.json#/definitions/DuplicateRegion"
                 },
                 "EmptyCodeBlock": {
-                    "$ref": "diagnostics-schema.json#/definitions/EmptyCodeBlock"
+                    "$ref": "parameters-schema.json#/definitions/EmptyCodeBlock"
                 },
                 "EmptyRegion": {
-                    "$ref": "diagnostics-schema.json#/definitions/EmptyRegion"
+                    "$ref": "parameters-schema.json#/definitions/EmptyRegion"
                 },
                 "EmptyStatement": {
-                    "$ref": "diagnostics-schema.json#/definitions/EmptyStatement"
+                    "$ref": "parameters-schema.json#/definitions/EmptyStatement"
                 },
                 "ExcessiveAutoTestCheck": {
                     "$ref": "diagnostics-schema.json#/definitions/ExcessiveAutoTestCheck"
                 },
                 "ExtraCommas": {
-                    "$ref": "diagnostics-schema.json#/definitions/ExtraCommas"
+                    "$ref": "parameters-schema.json#/definitions/ExtraCommas"
                 },
                 "FormDataToValue": {
-                    "$ref": "diagnostics-schema.json#/definitions/FormDataToValue"
+                    "$ref": "parameters-schema.json#/definitions/FormDataToValue"
                 },
                 "FunctionNameStartsWithGet": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionNameStartsWithGet"
+                    "$ref": "parameters-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
                 "FunctionShouldHaveReturn": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionShouldHaveReturn"
+                    "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
                 "GetFormMethod": {
-                    "$ref": "diagnostics-schema.json#/definitions/GetFormMethod"
+                    "$ref": "parameters-schema.json#/definitions/GetFormMethod"
                 },
                 "IdenticalExpressions": {
-                    "$ref": "diagnostics-schema.json#/definitions/IdenticalExpressions"
+                    "$ref": "parameters-schema.json#/definitions/IdenticalExpressions"
                 },
                 "IfConditionComplexity": {
-                    "$ref": "diagnostics-schema.json#/definitions/IfConditionComplexity"
+                    "$ref": "parameters-schema.json#/definitions/IfConditionComplexity"
                 },
                 "IfElseDuplicatedCodeBlock": {
-                    "$ref": "diagnostics-schema.json#/definitions/IfElseDuplicatedCodeBlock"
+                    "$ref": "parameters-schema.json#/definitions/IfElseDuplicatedCodeBlock"
                 },
                 "IfElseDuplicatedCondition": {
-                    "$ref": "diagnostics-schema.json#/definitions/IfElseDuplicatedCondition"
+                    "$ref": "parameters-schema.json#/definitions/IfElseDuplicatedCondition"
                 },
                 "IfElseIfEndsWithElse": {
-                    "$ref": "diagnostics-schema.json#/definitions/IfElseIfEndsWithElse"
+                    "$ref": "parameters-schema.json#/definitions/IfElseIfEndsWithElse"
                 },
                 "InvalidCharacterInFile": {
-                    "$ref": "diagnostics-schema.json#/definitions/InvalidCharacterInFile"
+                    "$ref": "parameters-schema.json#/definitions/InvalidCharacterInFile"
                 },
                 "LineLength": {
-                    "$ref": "diagnostics-schema.json#/definitions/LineLength"
+                    "$ref": "parameters-schema.json#/definitions/LineLength"
                 },
                 "MagicNumber": {
-                    "$ref": "diagnostics-schema.json#/definitions/MagicNumber"
+                    "$ref": "parameters-schema.json#/definitions/MagicNumber"
                 },
                 "MethodSize": {
-                    "$ref": "diagnostics-schema.json#/definitions/MethodSize"
+                    "$ref": "parameters-schema.json#/definitions/MethodSize"
                 },
                 "MissingCodeTryCatchEx": {
-                    "$ref": "diagnostics-schema.json#/definitions/MissingCodeTryCatchEx"
+                    "$ref": "parameters-schema.json#/definitions/MissingCodeTryCatchEx"
                 },
                 "MissingSpace": {
-                    "$ref": "diagnostics-schema.json#/definitions/MissingSpace"
+                    "$ref": "parameters-schema.json#/definitions/MissingSpace"
                 },
                 "MissingTemporaryFileDeletion": {
-                    "$ref": "diagnostics-schema.json#/definitions/MissingTemporaryFileDeletion"
+                    "$ref": "parameters-schema.json#/definitions/MissingTemporaryFileDeletion"
                 },
                 "MissingVariablesDescription": {
                     "$ref": "diagnostics-schema.json#/definitions/MissingVariablesDescription"
                 },
                 "MultilingualStringHasAllDeclaredLanguages": {
-                    "$ref": "diagnostics-schema.json#/definitions/MultilingualStringHasAllDeclaredLanguages"
+                    "$ref": "parameters-schema.json#/definitions/MultilingualStringHasAllDeclaredLanguages"
                 },
                 "MultilingualStringUsingWithTemplate": {
-                    "$ref": "diagnostics-schema.json#/definitions/MultilingualStringUsingWithTemplate"
+                    "$ref": "parameters-schema.json#/definitions/MultilingualStringUsingWithTemplate"
                 },
                 "NestedConstructorsInStructureDeclaration": {
-                    "$ref": "diagnostics-schema.json#/definitions/NestedConstructorsInStructureDeclaration"
+                    "$ref": "parameters-schema.json#/definitions/NestedConstructorsInStructureDeclaration"
                 },
                 "NestedFunctionInParameters": {
-                    "$ref": "diagnostics-schema.json#/definitions/NestedFunctionInParameters"
+                    "$ref": "parameters-schema.json#/definitions/NestedFunctionInParameters"
                 },
                 "NestedStatements": {
-                    "$ref": "diagnostics-schema.json#/definitions/NestedStatements"
+                    "$ref": "parameters-schema.json#/definitions/NestedStatements"
                 },
                 "NestedTernaryOperator": {
-                    "$ref": "diagnostics-schema.json#/definitions/NestedTernaryOperator"
+                    "$ref": "parameters-schema.json#/definitions/NestedTernaryOperator"
                 },
                 "NonExportMethodsInApiRegion": {
-                    "$ref": "diagnostics-schema.json#/definitions/NonExportMethodsInApiRegion"
+                    "$ref": "parameters-schema.json#/definitions/NonExportMethodsInApiRegion"
                 },
                 "NonStandardRegion": {
-                    "$ref": "diagnostics-schema.json#/definitions/NonStandardRegion"
+                    "$ref": "parameters-schema.json#/definitions/NonStandardRegion"
                 },
                 "NumberOfOptionalParams": {
-                    "$ref": "diagnostics-schema.json#/definitions/NumberOfOptionalParams"
+                    "$ref": "parameters-schema.json#/definitions/NumberOfOptionalParams"
                 },
                 "NumberOfParams": {
-                    "$ref": "diagnostics-schema.json#/definitions/NumberOfParams"
+                    "$ref": "parameters-schema.json#/definitions/NumberOfParams"
                 },
                 "NumberOfValuesInStructureConstructor": {
-                    "$ref": "diagnostics-schema.json#/definitions/NumberOfValuesInStructureConstructor"
+                    "$ref": "parameters-schema.json#/definitions/NumberOfValuesInStructureConstructor"
                 },
                 "OSUsersMethod": {
-                    "$ref": "diagnostics-schema.json#/definitions/OSUsersMethod"
+                    "$ref": "parameters-schema.json#/definitions/OSUsersMethod"
                 },
                 "OneStatementPerLine": {
-                    "$ref": "diagnostics-schema.json#/definitions/OneStatementPerLine"
+                    "$ref": "parameters-schema.json#/definitions/OneStatementPerLine"
                 },
                 "OrderOfParams": {
-                    "$ref": "diagnostics-schema.json#/definitions/OrderOfParams"
+                    "$ref": "parameters-schema.json#/definitions/OrderOfParams"
                 },
                 "PairingBrokenTransaction": {
-                    "$ref": "diagnostics-schema.json#/definitions/PairingBrokenTransaction"
+                    "$ref": "parameters-schema.json#/definitions/PairingBrokenTransaction"
                 },
                 "ParseError": {
-                    "$ref": "diagnostics-schema.json#/definitions/ParseError"
+                    "$ref": "parameters-schema.json#/definitions/ParseError"
                 },
                 "ProcedureReturnsValue": {
-                    "$ref": "diagnostics-schema.json#/definitions/ProcedureReturnsValue"
+                    "$ref": "parameters-schema.json#/definitions/ProcedureReturnsValue"
                 },
                 "PublicMethodsDescription": {
-                    "$ref": "diagnostics-schema.json#/definitions/PublicMethodsDescription"
+                    "$ref": "parameters-schema.json#/definitions/PublicMethodsDescription"
                 },
                 "SelfAssign": {
-                    "$ref": "diagnostics-schema.json#/definitions/SelfAssign"
+                    "$ref": "parameters-schema.json#/definitions/SelfAssign"
                 },
                 "SelfInsertion": {
-                    "$ref": "diagnostics-schema.json#/definitions/SelfInsertion"
+                    "$ref": "parameters-schema.json#/definitions/SelfInsertion"
                 },
                 "SemicolonPresence": {
-                    "$ref": "diagnostics-schema.json#/definitions/SemicolonPresence"
+                    "$ref": "parameters-schema.json#/definitions/SemicolonPresence"
                 },
                 "SeveralCompilerDirectives": {
-                    "$ref": "diagnostics-schema.json#/definitions/SeveralCompilerDirectives"
+                    "$ref": "parameters-schema.json#/definitions/SeveralCompilerDirectives"
                 },
                 "SpaceAtStartComment": {
-                    "$ref": "diagnostics-schema.json#/definitions/SpaceAtStartComment"
+                    "$ref": "parameters-schema.json#/definitions/SpaceAtStartComment"
                 },
                 "TempFilesDir": {
-                    "$ref": "diagnostics-schema.json#/definitions/TempFilesDir"
+                    "$ref": "parameters-schema.json#/definitions/TempFilesDir"
                 },
                 "TernaryOperatorUsage": {
-                    "$ref": "diagnostics-schema.json#/definitions/TernaryOperatorUsage"
+                    "$ref": "parameters-schema.json#/definitions/TernaryOperatorUsage"
                 },
                 "ThisObjectAssign": {
                     "$ref": "diagnostics-schema.json#/definitions/ThisObjectAssign"
                 },
                 "TimeoutsInExternalResources": {
-                    "$ref": "diagnostics-schema.json#/definitions/TimeoutsInExternalResources"
+                    "$ref": "parameters-schema.json#/definitions/TimeoutsInExternalResources"
                 },
                 "TooManyReturns": {
-                    "$ref": "diagnostics-schema.json#/definitions/TooManyReturns"
+                    "$ref": "parameters-schema.json#/definitions/TooManyReturns"
                 },
                 "TryNumber": {
-                    "$ref": "diagnostics-schema.json#/definitions/TryNumber"
+                    "$ref": "parameters-schema.json#/definitions/TryNumber"
                 },
                 "Typo": {
-                    "$ref": "diagnostics-schema.json#/definitions/Typo"
+                    "$ref": "parameters-schema.json#/definitions/Typo"
                 },
                 "UnaryPlusInConcatenation": {
-                    "$ref": "diagnostics-schema.json#/definitions/UnaryPlusInConcatenation"
+                    "$ref": "parameters-schema.json#/definitions/UnaryPlusInConcatenation"
                 },
                 "UnknownPreprocessorSymbol": {
-                    "$ref": "diagnostics-schema.json#/definitions/UnknownPreprocessorSymbol"
+                    "$ref": "parameters-schema.json#/definitions/UnknownPreprocessorSymbol"
                 },
                 "UnreachableCode": {
-                    "$ref": "diagnostics-schema.json#/definitions/UnreachableCode"
+                    "$ref": "parameters-schema.json#/definitions/UnreachableCode"
                 },
                 "UnusedLocalMethod": {
-                    "$ref": "diagnostics-schema.json#/definitions/UnusedLocalMethod"
+                    "$ref": "parameters-schema.json#/definitions/UnusedLocalMethod"
                 },
                 "UnusedParameters": {
-                    "$ref": "diagnostics-schema.json#/definitions/UnusedParameters"
+                    "$ref": "parameters-schema.json#/definitions/UnusedParameters"
                 },
                 "UseLessForEach": {
-                    "$ref": "diagnostics-schema.json#/definitions/UseLessForEach"
+                    "$ref": "parameters-schema.json#/definitions/UseLessForEach"
                 },
                 "UsingCancelParameter": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingCancelParameter"
+                    "$ref": "parameters-schema.json#/definitions/UsingCancelParameter"
                 },
                 "UsingExternalCodeTools": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingExternalCodeTools"
+                    "$ref": "parameters-schema.json#/definitions/UsingExternalCodeTools"
                 },
                 "UsingFindElementByString": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingFindElementByString"
+                    "$ref": "parameters-schema.json#/definitions/UsingFindElementByString"
                 },
                 "UsingGoto": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingGoto"
+                    "$ref": "parameters-schema.json#/definitions/UsingGoto"
                 },
                 "UsingHardcodeNetworkAddress": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingHardcodeNetworkAddress"
+                    "$ref": "parameters-schema.json#/definitions/UsingHardcodeNetworkAddress"
                 },
                 "UsingHardcodePath": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingHardcodePath"
+                    "$ref": "parameters-schema.json#/definitions/UsingHardcodePath"
                 },
                 "UsingHardcodeSecretInformation": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingHardcodeSecretInformation"
+                    "$ref": "parameters-schema.json#/definitions/UsingHardcodeSecretInformation"
                 },
                 "UsingModalWindows": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingModalWindows"
+                    "$ref": "parameters-schema.json#/definitions/UsingModalWindows"
                 },
                 "UsingObjectNotAvailableUnix": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingObjectNotAvailableUnix"
+                    "$ref": "parameters-schema.json#/definitions/UsingObjectNotAvailableUnix"
                 },
                 "UsingServiceTag": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingServiceTag"
+                    "$ref": "parameters-schema.json#/definitions/UsingServiceTag"
                 },
                 "UsingSynchronousCalls": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingSynchronousCalls"
+                    "$ref": "parameters-schema.json#/definitions/UsingSynchronousCalls"
                 },
                 "UsingThisForm": {
-                    "$ref": "diagnostics-schema.json#/definitions/UsingThisForm"
+                    "$ref": "parameters-schema.json#/definitions/UsingThisForm"
                 },
                 "WrongUseOfRollbackTransactionMethod": {
-                    "$ref": "diagnostics-schema.json#/definitions/WrongUseOfRollbackTransactionMethod"
+                    "$ref": "parameters-schema.json#/definitions/WrongUseOfRollbackTransactionMethod"
                 },
                 "YoLetterUsage": {
-                    "$ref": "diagnostics-schema.json#/definitions/YoLetterUsage"
+                    "$ref": "parameters-schema.json#/definitions/YoLetterUsage"
                 }
             }
         }
+    },
+    "properties": {
+        "language": {
+            "$id": "#/properties/language",
+            "type": "string",
+            "oneOf": [
+                {
+                    "const": "en",
+                    "description": "English"
+                },
+                {
+                    "const": "ru",
+                    "description": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439 (russian)"
+                }
+            ],
+            "title": "Language of messages, resources and all communications between BLS LS and user.",
+            "default": "ru"
+        },
+        "codeLens": {
+            "$id": "#/properties/codeLens",
+            "type": "object",
+            "title": "Code Lens configuration.",
+            "default": null,
+            "properties": {
+                "showCognitiveComplexity": {
+                    "$id": "#/properties/showCognitiveComplexity",
+                    "type": "boolean",
+                    "title": "Show cognitive complexity score above method definition.",
+                    "default": true
+                },
+                "showCyclomaticComplexity": {
+                    "$id": "#/properties/showCyclomaticComplexity",
+                    "type": "boolean",
+                    "title": "Show cyclomatic complexity score above method definition.",
+                    "default": true
+                }
+            }
+        },
+        "diagnostics": {
+            "$id": "#/properties/diagnostics",
+            "type": "object",
+            "title": "Diagnostics configuration.",
+            "default": null,
+            "properties": {
+                "parameters": {
+                    "$ref": "#/definitions/parameters"
+                },
+                "computeTrigger": {
+                    "$id": "#/properties/computeTrigger",
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "const": "onSave",
+                            "description": "Compute on save"
+                        },
+                        {
+                            "const": "onType",
+                            "description": "Compute on type (edit file)"
+                        },
+                        {
+                            "const": "never",
+                            "description": "Never compute"
+                        }
+                    ],
+                    "title": "Trigger for the computation of diagnostics.",
+                    "default": "onSave"
+                },
+                "skipSupport": {
+                    "$id": "#/properties/skipSupport",
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "const": "withSupport",
+                            "description": "Skip computing diagnostics on modules with any kind of support."
+                        },
+                        {
+                            "const": "withSupportLocked",
+                            "description": "Skip computing diagnostics on modules with `not editable` support mode."
+                        },
+                        {
+                            "const": "never",
+                            "description": "Never skip computing."
+                        }
+                    ],
+                    "title": "Analyze module support variant and skip all diagnostics if necessary.",
+                    "default": "never"
+                },
+                "mode": {
+                    "$id": "#/properties/mode",
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "const": "on",
+                            "description": "All diagnostics activated by default are enabled."
+                        },
+                        {
+                            "const": "off",
+                            "description": "All diagnostics are disabled"
+                        },
+                        {
+                            "const": "except",
+                            "description": "All diagnostics except defined in 'parameters' section are disabled."
+                        },
+                        {
+                            "const": "only",
+                            "description": "Only diagnostics defined in 'parameters' section are enabled."
+                        },
+                        {
+                            "const": "all",
+                            "description": "All diagnostics are enabled."
+                        }
+                    ],
+                    "title": "Diagnostics enabling/disabling mode.",
+                    "default": "on"
+                }
+            }
+        },
+        "traceLog": {
+            "$id": "#/properties/traceLog",
+            "type": "string",
+            "title": "Path to file to log all inbound and outbound requests between BSL Language Server and Language Client from used IDE.\nCan be absolute or relative (to the project root). If set *significantly slows down* communication speed between server and client.",
+            "default": "",
+            "examples": [
+                ".trace.log"
+            ]
+        },
+        "configurationRoot": {
+            "$id": "#/properties/configurationRoot",
+            "type": "string",
+            "title": "Path to root directory of configuration files.",
+            "default": null
+        }
     }
 }
\ No newline at end of file

From 2af7087610b9d1459ed2146e0f1e090df71b843f Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Tue, 14 Apr 2020 13:13:03 +0300
Subject: [PATCH 105/444] =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D1=80=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=81=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BF=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B9=20=D1=81=D1=85=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/developer-tools.gradle.kts | 65 ++++++++++++++++---------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/gradle/developer-tools.gradle.kts b/gradle/developer-tools.gradle.kts
index 9edc83a1fec..8b6be96d8ad 100644
--- a/gradle/developer-tools.gradle.kts
+++ b/gradle/developer-tools.gradle.kts
@@ -8,7 +8,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
     val outputDir: DirectoryProperty = objects.directoryProperty()
 
     private var schemaPath = "src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json"
-    private var diagnosticSchemaPath = "src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json"
+    private var diagnosticSchemaPath = "src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json"
 
     private var templateDocHeader = "# <Description> (<DiagnosticKey>)\n\n<Metadata>\n<Params>" +
             "<!-- Блоки выше заполняются автоматически, не трогать -->\n"
@@ -53,7 +53,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
             "String" to "Строка",
             "Float" to "Число с плавающей точкой")
 
-    private fun createDiagnosticSupplier(lang: String, classLoader: ClassLoader) : Any {
+    private fun createDiagnosticSupplier(lang: String, classLoader: ClassLoader): Any {
         val languageServerConfigurationClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration")
         val languageClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.configuration.Language")
 
@@ -81,7 +81,8 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
 
         val urlsParent: ArrayList<URL> = ArrayList()
         project.configurations.getByName("runtimeClasspath").files.forEach {
-            urlsParent.add(it.toURI().toURL())}
+            urlsParent.add(it.toURI().toURL())
+        }
         val parentCL = URLClassLoader(urlsParent.toTypedArray())
         return URLClassLoader(urls.toTypedArray(), parentCL)
     }
@@ -97,16 +98,18 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
         val result = hashMapOf<String, HashMap<String, Any>>()
         File(project.buildDir, "classes/java/main/com/github/_1c_syntax/bsl/languageserver/diagnostics")
                 .walkTopDown()
-                .filter{it.name.endsWith("Diagnostic.class")
-                        && !it.name.startsWith("Abstract")}
+                .filter {
+                    it.name.endsWith("Diagnostic.class")
+                            && !it.name.startsWith("Abstract")
+                }
                 .forEach {
                     val diagnosticClass = classLoader.loadClass("com.github._1c_syntax.bsl.languageserver.diagnostics.${it.nameWithoutExtension}")
-                    if(!diagnosticClass.toString().startsWith("interface")){
+                    if (!diagnosticClass.toString().startsWith("interface")) {
                         val diagnosticInstanceRU = diagnosticSupplierClass.getDeclaredMethod("getDiagnosticInstance", diagnosticClass.javaClass).invoke(diagnosticSupplierRU, diagnosticClass)
                         val diagnosticInstanceEN = diagnosticSupplierClass.getDeclaredMethod("getDiagnosticInstance", diagnosticClass.javaClass).invoke(diagnosticSupplierEN, diagnosticClass)
 
                         val metadata = getDiagnosticMetadata(diagnosticClass, diagnosticInstanceRU, diagnosticInstanceEN, classLoader)
-                        if(metadata.isNotEmpty() && metadata["key"] is String) {
+                        if (metadata.isNotEmpty() && metadata["key"] is String) {
                             result[metadata["key"] as String] = metadata
                         }
                     }
@@ -139,8 +142,8 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
 
         val params = arrayListOf<HashMap<String, String>>()
         val parameters = diagnosticInfoClass.getMethod("getParameters").invoke(infoRU)
-        if(parameters is ArrayList<*>) {
-            for(parameter in parameters) {
+        if (parameters is ArrayList<*>) {
+            for (parameter in parameters) {
                 val oneParameter = hashMapOf<String, String>()
                 val parameterName = diagnosticParameterInfoClass.getMethod("getName").invoke(parameter).toString()
                 oneParameter["name"] = parameterName
@@ -162,7 +165,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
     @TaskAction
     fun execTask() {
         val diagnosticsMetadata = getDiagnosticsMetadata()
-        if(taskName == "Update diagnostic docs") {
+        if (taskName == "Update diagnostic docs") {
             logger.quiet("Update diagnostic docs")
             diagnosticsMetadata.forEach {
                 updateDocFile("ru",
@@ -173,12 +176,12 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
                         it.key,
                         it.value)
             }
-        } else if(taskName == "Update diagnostics index") {
+        } else if (taskName == "Update diagnostics index") {
             logger.quiet("Update diagnostics index")
             val diagnosticsMetadataSort = diagnosticsMetadata.toSortedMap()
             updateDiagnosticIndex("ru", diagnosticsMetadataSort)
             updateDiagnosticIndex("en", diagnosticsMetadataSort)
-        } else if(taskName == "Update json schema") {
+        } else if (taskName == "Update json schema") {
             val diagnosticMeta = transformMetadata(diagnosticsMetadata)
             var schemaJson = groovy.json.JsonSlurper().parseText(File(outputDir.get().asFile.path, diagnosticSchemaPath).readText(charset("UTF-8")))
             if (schemaJson is Map<*, *>) {
@@ -191,16 +194,16 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
             schemaJson = groovy.json.JsonSlurper().parseText(File(outputDir.get().asFile.path, schemaPath).readText(charset("UTF-8")))
             if (schemaJson is Map<*, *>) {
                 val schema = schemaJson.toMap().toMutableMap()
-                val schemaProperties = schema["properties"]
-                if (schemaProperties != null && schemaProperties is Map<*, *>) {
-                    val schProp = schemaProperties.toMap().toMutableMap()
-                    val schemaPropertiesDiagnostics = schProp["diagnostics"]
-                    if (schemaPropertiesDiagnostics != null && schemaPropertiesDiagnostics is Map<*, *>) {
-                        val schPropDiag = schemaPropertiesDiagnostics.toMap().toMutableMap()
-                        schPropDiag["properties"] = diagnosticMeta["diagnosticsKeys"]
-                        schProp["diagnostics"] = schPropDiag
+                val schemaDefinitions = schema["definitions"]
+                if (schemaDefinitions != null && schemaDefinitions is Map<*, *>) {
+                    val schemaDefinitionInner = schemaDefinitions.toMap().toMutableMap()
+                    val schemaParameters = schemaDefinitionInner["parameters"]
+                    if (schemaParameters != null && schemaParameters is Map<*, *>) {
+                        val schemaParametersInner = schemaParameters.toMap().toMutableMap()
+                        schemaParametersInner["properties"] = diagnosticMeta["diagnosticsKeys"]
+                        schemaDefinitionInner["parameters"] = schemaParametersInner
                     }
-                    schema["properties"] = schProp
+                    schema["definitions"] = schemaDefinitionInner
                 }
 
                 val resultString = groovy.json.JsonBuilder(schema).toPrettyString()
@@ -214,8 +217,8 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
         val diagnostics = sortedMapOf<String, Any>()
         val diagnosticsKeys = sortedMapOf<String, HashMap<String, String>>()
 
-        diagnosticsMetadata.forEach {itd ->
-            diagnosticsKeys[itd.key] = hashMapOf("\$ref" to "diagnostics-schema.json#/definitions/${itd.key}")
+        diagnosticsMetadata.forEach { itd ->
+            diagnosticsKeys[itd.key] = hashMapOf("\$ref" to "parameters-schema.json#/definitions/${itd.key}")
             val diagnostic = hashMapOf("\$id" to "#/definitions/${itd.key}",
                     "type" to arrayListOf("boolean", "object"),
                     "title" to itd.value.getOrDefault("description_en", "").toString(),
@@ -276,7 +279,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
                     .replace("[", "`")
                     .replace("]", "`")
                     .replace(", ", "`<br/>`")
-            if(lang == "ru") {
+            if (lang == "ru") {
                 typeString = typeRuMap.getOrDefault(metadata.getOrDefault("type", ""), "")
                 indexText += templateIndexLine
                         .replace("<Name>", it.key)
@@ -299,7 +302,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
             typeCount[typeString] = typeCount.getOrDefault(typeString, 0) + 1
         }
 
-        val indexPath = if(lang == "ru") {
+        val indexPath = if (lang == "ru") {
             File(outputDir.get().asFile.path, "docs/diagnostics/index.md")
         } else {
             File(outputDir.get().asFile.path, "docs/en/diagnostics/index.md")
@@ -327,7 +330,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
     }
 
     private fun updateDocFile(lang: String, key: String, metadata: HashMap<String, Any>) {
-        val docPath = if(lang == "ru") {
+        val docPath = if (lang == "ru") {
             File(outputDir.get().asFile.path, "docs/diagnostics/${key}.md")
         } else {
             File(outputDir.get().asFile.path, "docs/en/diagnostics/${key}.md")
@@ -465,7 +468,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
 
     private fun makeDiagnosticConfigExample(metadata: HashMap<String, Any>): String {
         val params = metadata.getOrDefault("parameters", arrayListOf<HashMap<String, String>>())
-        if(params is ArrayList<*>) {
+        if (params is ArrayList<*>) {
 
             if (params.isEmpty()) {
                 return "false"
@@ -475,7 +478,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
             var configDelimiter = ""
             params.forEach {
                 if (it is HashMap<*, *>) {
-                    val qoutes = if(it.getOrDefault("type", "") == "Boolean"
+                    val qoutes = if (it.getOrDefault("type", "") == "Boolean"
                             || it.getOrDefault("type", "") == "Integer"
                             || it.getOrDefault("type", "") == "Float") "" else "\""
                     configBody += "$configDelimiter    \"${it.getOrDefault("name", "")}\": " +
@@ -498,7 +501,7 @@ tasks.register<DeveloperTools>("updateDiagnosticDocs") {
     description = "Updates diagnostic docs after changes"
     outputDir.set(project.layout.projectDirectory)
     taskName = "Update diagnostic docs"
-    outputs.upToDateWhen {false}
+    outputs.upToDateWhen { false }
 }
 
 tasks.register<DeveloperTools>("updateDiagnosticsIndex") {
@@ -507,7 +510,7 @@ tasks.register<DeveloperTools>("updateDiagnosticsIndex") {
     description = "Update diagnostics index after changes"
     outputDir.set(project.layout.projectDirectory)
     taskName = "Update diagnostics index"
-    outputs.upToDateWhen {false}
+    outputs.upToDateWhen { false }
 }
 
 tasks.register<DeveloperTools>("updateJsonSchema") {
@@ -516,5 +519,5 @@ tasks.register<DeveloperTools>("updateJsonSchema") {
     description = "Update json schema"
     outputDir.set(project.layout.projectDirectory)
     taskName = "Update json schema"
-    outputs.upToDateWhen {false}
+    outputs.upToDateWhen { false }
 }

From 5cff3da35d007beded8d00af1dc1435a13ce96a8 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Tue, 14 Apr 2020 13:40:55 +0300
Subject: [PATCH 106/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/developer-tools.gradle.kts             |   2 +-
 .../configuration/parameters-schema.json      | 172 +++++++++---------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/gradle/developer-tools.gradle.kts b/gradle/developer-tools.gradle.kts
index 8b6be96d8ad..753b9d34602 100644
--- a/gradle/developer-tools.gradle.kts
+++ b/gradle/developer-tools.gradle.kts
@@ -223,7 +223,7 @@ open class DeveloperTools @javax.inject.Inject constructor(objects: ObjectFactor
                     "type" to arrayListOf("boolean", "object"),
                     "title" to itd.value.getOrDefault("description_en", "").toString(),
                     "description" to itd.value.getOrDefault("description_en", "").toString(),
-                    "default" to null)
+                    "default" to itd.value.getOrDefault("activatedByDefault", "false").toString().toBoolean())
             val params = HashMap<String, Any>()
 
             val parameters = itd.value.getOrDefault("parameters", arrayListOf<HashMap<String, String>>()) as ArrayList<*>
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 1820ff1f817..cbe9edd2495 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
@@ -6,7 +6,7 @@
     "definitions": {
         "BeginTransactionBeforeTryCatch": {
             "description": "Violating transaction rules for the 'BeginTransaction' method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -16,7 +16,7 @@
         },
         "CanonicalSpellingKeywords": {
             "description": "Canonical keyword writing",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -26,7 +26,7 @@
         },
         "CodeBlockBeforeSub": {
             "description": "Method definitions must be placed before the module body operators",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -36,7 +36,7 @@
         },
         "CodeOutOfRegion": {
             "description": "Code out of region",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -46,7 +46,7 @@
         },
         "CognitiveComplexity": {
             "description": "Cognitive complexity",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -70,7 +70,7 @@
         },
         "CommentedCode": {
             "description": "Commented out code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -88,7 +88,7 @@
         },
         "CommitTransactionOutsideTryCatch": {
             "description": "Violating transaction rules for the 'CommitTransaction' method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -108,7 +108,7 @@
         },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -118,7 +118,7 @@
         },
         "CompilationDirectiveNeedLess": {
             "description": "Needless compilation directive",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -146,7 +146,7 @@
         },
         "CreateQueryInCycle": {
             "description": "Execution query on cycle",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -156,7 +156,7 @@
         },
         "CyclomaticComplexity": {
             "description": "Cyclomatic complexity",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -198,7 +198,7 @@
         },
         "DeletingCollectionItem": {
             "description": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -208,7 +208,7 @@
         },
         "DeprecatedCurrentDate": {
             "description": "Using of the deprecated method \"CurrentDate\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -218,7 +218,7 @@
         },
         "DeprecatedFind": {
             "description": "Using of the deprecated method \"Find\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -228,7 +228,7 @@
         },
         "DeprecatedMessage": {
             "description": "Restriction on the use of deprecated \"Message\" method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -238,7 +238,7 @@
         },
         "DeprecatedTypeManagedForm": {
             "description": "Deprecated ManagedForm type",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -248,7 +248,7 @@
         },
         "DuplicateRegion": {
             "description": "Duplicate regions",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -258,7 +258,7 @@
         },
         "EmptyCodeBlock": {
             "description": "Empty code block",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -276,7 +276,7 @@
         },
         "EmptyRegion": {
             "description": "The region should not be empty",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -286,7 +286,7 @@
         },
         "EmptyStatement": {
             "description": "Empty statement",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -306,7 +306,7 @@
         },
         "ExtraCommas": {
             "description": "Commas without a parameter at the end of a method call",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -316,7 +316,7 @@
         },
         "FormDataToValue": {
             "description": "FormDataToValue method call",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -326,7 +326,7 @@
         },
         "FunctionNameStartsWithGet": {
             "description": "Function name shouldn't start with \"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\"",
-            "default": null,
+            "default": false,
             "type": [
                 "boolean",
                 "object"
@@ -336,7 +336,7 @@
         },
         "FunctionShouldHaveReturn": {
             "description": "The function should have return",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -346,7 +346,7 @@
         },
         "GetFormMethod": {
             "description": "GetForm method call",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -356,7 +356,7 @@
         },
         "IdenticalExpressions": {
             "description": "There are identical sub-expressions to the left and to the right of the \"foo\" operator",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -366,7 +366,7 @@
         },
         "IfConditionComplexity": {
             "description": "Usage of complex expressions in the \"If\" condition",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -384,7 +384,7 @@
         },
         "IfElseDuplicatedCodeBlock": {
             "description": "Duplicated code blocks in If...Then...ElseIf... statements",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -394,7 +394,7 @@
         },
         "IfElseDuplicatedCondition": {
             "description": "Duplicated conditions in If...Then...ElseIf... statements",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -404,7 +404,7 @@
         },
         "IfElseIfEndsWithElse": {
             "description": "Else...The...ElseIf... statement should end with Else branch",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -414,7 +414,7 @@
         },
         "InvalidCharacterInFile": {
             "description": "Invalid character",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -424,7 +424,7 @@
         },
         "LineLength": {
             "description": "Line Length limit",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -442,7 +442,7 @@
         },
         "MagicNumber": {
             "description": "Magic numbers",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -466,7 +466,7 @@
         },
         "MethodSize": {
             "description": "Method size",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -484,7 +484,7 @@
         },
         "MissingCodeTryCatchEx": {
             "description": "Missing code in Raise block in \"Try ... Raise ... EndTry\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -502,7 +502,7 @@
         },
         "MissingSpace": {
             "description": "Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ;",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -544,7 +544,7 @@
         },
         "MissingTemporaryFileDeletion": {
             "description": "Missing temporary file deletion after using",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -572,7 +572,7 @@
         },
         "MultilingualStringHasAllDeclaredLanguages": {
             "description": "There is a localized text for all languages declared in the configuration",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -590,7 +590,7 @@
         },
         "MultilingualStringUsingWithTemplate": {
             "description": "Partially localized text is used in the StrTemplate function",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -608,7 +608,7 @@
         },
         "NestedConstructorsInStructureDeclaration": {
             "description": "Nested constructors with parameters in structure declaration",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -618,7 +618,7 @@
         },
         "NestedFunctionInParameters": {
             "description": "Initialization of method and constructor parameters by calling nested methods",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -628,7 +628,7 @@
         },
         "NestedStatements": {
             "description": "Control flow statements should not be nested too deep",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -646,7 +646,7 @@
         },
         "NestedTernaryOperator": {
             "description": "Nested ternary operator",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -656,7 +656,7 @@
         },
         "NonExportMethodsInApiRegion": {
             "description": "Non export methods in API regions",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -666,7 +666,7 @@
         },
         "NonStandardRegion": {
             "description": "Non-standard region of module",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -676,7 +676,7 @@
         },
         "NumberOfOptionalParams": {
             "description": "Limit number of optional parameters in method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -694,7 +694,7 @@
         },
         "NumberOfParams": {
             "description": "Number of parameters in method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -712,7 +712,7 @@
         },
         "NumberOfValuesInStructureConstructor": {
             "description": "Limit on the number of property values passed to the structure constructor",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -730,7 +730,7 @@
         },
         "OSUsersMethod": {
             "description": "Using method OSUsers",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -740,7 +740,7 @@
         },
         "OneStatementPerLine": {
             "description": "One statement per line",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -750,7 +750,7 @@
         },
         "OrderOfParams": {
             "description": "Order of Parameters in method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -760,7 +760,7 @@
         },
         "PairingBrokenTransaction": {
             "description": "Violation of pairing using methods \"BeginTransaction()\" & \"CommitTransaction()\" / \"RollbackTransaction()\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -770,7 +770,7 @@
         },
         "ParseError": {
             "description": "Source code parse error",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -780,7 +780,7 @@
         },
         "ProcedureReturnsValue": {
             "description": "Procedure should not return Value",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -790,7 +790,7 @@
         },
         "PublicMethodsDescription": {
             "description": "All public methods must have a description",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -808,7 +808,7 @@
         },
         "SelfAssign": {
             "description": "Variable is assigned to itself",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -818,7 +818,7 @@
         },
         "SelfInsertion": {
             "description": "Insert a collection into itself",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -828,7 +828,7 @@
         },
         "SemicolonPresence": {
             "description": "Statement should end with semicolon symbol \";\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -838,7 +838,7 @@
         },
         "SeveralCompilerDirectives": {
             "description": "Erroneous indication of several compilation directives",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -848,7 +848,7 @@
         },
         "SpaceAtStartComment": {
             "description": "Space at the beginning of the comment",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -866,7 +866,7 @@
         },
         "TempFilesDir": {
             "description": "TempFilesDir() method call",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -876,7 +876,7 @@
         },
         "TernaryOperatorUsage": {
             "description": "Ternary operator usage",
-            "default": null,
+            "default": false,
             "type": [
                 "boolean",
                 "object"
@@ -896,7 +896,7 @@
         },
         "TimeoutsInExternalResources": {
             "description": "Timeouts working with external resources",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -914,7 +914,7 @@
         },
         "TooManyReturns": {
             "description": "Methods should not have too many return statements",
-            "default": null,
+            "default": false,
             "type": [
                 "boolean",
                 "object"
@@ -932,7 +932,7 @@
         },
         "TryNumber": {
             "description": "Cast to number of try catch block",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -942,7 +942,7 @@
         },
         "Typo": {
             "description": "Typo",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -966,7 +966,7 @@
         },
         "UnaryPlusInConcatenation": {
             "description": "Unary Plus sign in string concatenation",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -976,7 +976,7 @@
         },
         "UnknownPreprocessorSymbol": {
             "description": "Unknown preprocessor symbol",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -986,7 +986,7 @@
         },
         "UnreachableCode": {
             "description": "Unreachable Code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -996,7 +996,7 @@
         },
         "UnusedLocalMethod": {
             "description": "Unused local method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1006,7 +1006,7 @@
         },
         "UnusedParameters": {
             "description": "Unused parameter",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1016,7 +1016,7 @@
         },
         "UseLessForEach": {
             "description": "Useless collection iteration",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1026,7 +1026,7 @@
         },
         "UsingCancelParameter": {
             "description": "Using parameter \"Cancel\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1036,7 +1036,7 @@
         },
         "UsingExternalCodeTools": {
             "description": "Using external code tools",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1046,7 +1046,7 @@
         },
         "UsingFindElementByString": {
             "description": "Using FindByName and FindByCode",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1056,7 +1056,7 @@
         },
         "UsingGoto": {
             "description": "\"goto\" statement should not be used",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1066,7 +1066,7 @@
         },
         "UsingHardcodeNetworkAddress": {
             "description": "Using hardcode ip addresses in code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1084,7 +1084,7 @@
         },
         "UsingHardcodePath": {
             "description": "Using hardcode file paths in code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1102,7 +1102,7 @@
         },
         "UsingHardcodeSecretInformation": {
             "description": "Storing confidential information in code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1120,7 +1120,7 @@
         },
         "UsingModalWindows": {
             "description": "Using modal windows",
-            "default": null,
+            "default": false,
             "type": [
                 "boolean",
                 "object"
@@ -1130,7 +1130,7 @@
         },
         "UsingObjectNotAvailableUnix": {
             "description": "Using unavailable in Unix objects",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1140,7 +1140,7 @@
         },
         "UsingServiceTag": {
             "description": "Using service tags",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1158,7 +1158,7 @@
         },
         "UsingSynchronousCalls": {
             "description": "Using synchronous calls",
-            "default": null,
+            "default": false,
             "type": [
                 "boolean",
                 "object"
@@ -1168,7 +1168,7 @@
         },
         "UsingThisForm": {
             "description": "Using deprecated property \"ThisForm\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1178,7 +1178,7 @@
         },
         "WrongUseOfRollbackTransactionMethod": {
             "description": "Not recommended using of RollbackTransaction method",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1188,7 +1188,7 @@
         },
         "YoLetterUsage": {
             "description": "Using Russian character \"yo\" (\"\u0451\") in code",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"

From cf65e7fdee3196de9d846361c604cc8ca2ebf148 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 21 Apr 2020 23:25:45 +0300
Subject: [PATCH 107/444] precommit

---
 docs/diagnostics/ConsecutiveEmptyLines.md            |  3 +--
 docs/en/diagnostics/ConsecutiveEmptyLines.md         |  3 +--
 .../configuration/parameters-schema.json             | 12 ++++++------
 .../bsl/languageserver/configuration/schema.json     | 12 ++++++------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/docs/diagnostics/ConsecutiveEmptyLines.md b/docs/diagnostics/ConsecutiveEmptyLines.md
index 870d6df000d..bbe63ac8e54 100644
--- a/docs/diagnostics/ConsecutiveEmptyLines.md
+++ b/docs/diagnostics/ConsecutiveEmptyLines.md
@@ -32,7 +32,6 @@
 
 ```json
 "ConsecutiveEmptyLines": {
-  "allowedEmptyLinesCount": 1
+    "allowedEmptyLinesCount": 1
 }
 ```
-
diff --git a/docs/en/diagnostics/ConsecutiveEmptyLines.md b/docs/en/diagnostics/ConsecutiveEmptyLines.md
index d4ee1307f9a..7cfb5033d72 100644
--- a/docs/en/diagnostics/ConsecutiveEmptyLines.md
+++ b/docs/en/diagnostics/ConsecutiveEmptyLines.md
@@ -14,7 +14,6 @@
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
@@ -29,6 +28,6 @@
 
 ```json
 "ConsecutiveEmptyLines": {
-  "allowedEmptyLinesCount": 1
+    "allowedEmptyLinesCount": 1
 }
 ```
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 cbe9edd2495..6eb3492e4b4 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
@@ -98,7 +98,7 @@
         },
         "CommonModuleAssign": {
             "description": "CommonModuleAssign",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -128,7 +128,7 @@
         },
         "ConsecutiveEmptyLines": {
             "description": "Consecutive empty lines",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -180,7 +180,7 @@
         },
         "DataExchangeLoading": {
             "description": "There is no check for the attribute DataExchange.Load in the object's event handler",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -296,7 +296,7 @@
         },
         "ExcessiveAutoTestCheck": {
             "description": "Excessive AutoTest Check",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -562,7 +562,7 @@
         },
         "MissingVariablesDescription": {
             "description": "All variables declarations must have a description",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -886,7 +886,7 @@
         },
         "ThisObjectAssign": {
             "description": "ThisObject assign",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
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 4f1a26da95a..aa01b50a23f 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
@@ -45,7 +45,7 @@
                     "$ref": "parameters-schema.json#/definitions/CommitTransactionOutsideTryCatch"
                 },
                 "CommonModuleAssign": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleAssign"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
                 "CompilationDirectiveLost": {
                     "$ref": "parameters-schema.json#/definitions/CompilationDirectiveLost"
@@ -54,7 +54,7 @@
                     "$ref": "parameters-schema.json#/definitions/CompilationDirectiveNeedLess"
                 },
                 "ConsecutiveEmptyLines": {
-                    "$ref": "diagnostics-schema.json#/definitions/ConsecutiveEmptyLines"
+                    "$ref": "parameters-schema.json#/definitions/ConsecutiveEmptyLines"
                 },
                 "CreateQueryInCycle": {
                     "$ref": "parameters-schema.json#/definitions/CreateQueryInCycle"
@@ -63,7 +63,7 @@
                     "$ref": "parameters-schema.json#/definitions/CyclomaticComplexity"
                 },
                 "DataExchangeLoading": {
-                    "$ref": "diagnostics-schema.json#/definitions/DataExchangeLoading"
+                    "$ref": "parameters-schema.json#/definitions/DataExchangeLoading"
                 },
                 "DeletingCollectionItem": {
                     "$ref": "parameters-schema.json#/definitions/DeletingCollectionItem"
@@ -93,7 +93,7 @@
                     "$ref": "parameters-schema.json#/definitions/EmptyStatement"
                 },
                 "ExcessiveAutoTestCheck": {
-                    "$ref": "diagnostics-schema.json#/definitions/ExcessiveAutoTestCheck"
+                    "$ref": "parameters-schema.json#/definitions/ExcessiveAutoTestCheck"
                 },
                 "ExtraCommas": {
                     "$ref": "parameters-schema.json#/definitions/ExtraCommas"
@@ -147,7 +147,7 @@
                     "$ref": "parameters-schema.json#/definitions/MissingTemporaryFileDeletion"
                 },
                 "MissingVariablesDescription": {
-                    "$ref": "diagnostics-schema.json#/definitions/MissingVariablesDescription"
+                    "$ref": "parameters-schema.json#/definitions/MissingVariablesDescription"
                 },
                 "MultilingualStringHasAllDeclaredLanguages": {
                     "$ref": "parameters-schema.json#/definitions/MultilingualStringHasAllDeclaredLanguages"
@@ -225,7 +225,7 @@
                     "$ref": "parameters-schema.json#/definitions/TernaryOperatorUsage"
                 },
                 "ThisObjectAssign": {
-                    "$ref": "diagnostics-schema.json#/definitions/ThisObjectAssign"
+                    "$ref": "parameters-schema.json#/definitions/ThisObjectAssign"
                 },
                 "TimeoutsInExternalResources": {
                     "$ref": "parameters-schema.json#/definitions/TimeoutsInExternalResources"

From 0316abf234db9491d2483566794bb4e356db9f9c Mon Sep 17 00:00:00 2001
From: Yuri Goncharuk <yukon39@gmail.com>
Date: Tue, 21 Apr 2020 23:41:02 +0300
Subject: [PATCH 108/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D0=BE=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D1=83=20=D0=B2=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D1=82=D1=80=D0=B5=D0=B1=D1=83?=
 =?UTF-8?q?=D1=8E=D1=89=D0=B8=D1=85=20=D0=BF=D0=BE=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=20GenericCoverage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reporter/GenericCoverageReport.java       | 109 ++++++++++++++++++
 .../reporter/GenericCoverageReporter.java     |  62 ++++++++++
 .../reporter/ReportersAggregator.java         |   1 +
 .../reporter/GenericCoverageTest.java         |  85 ++++++++++++++
 4 files changed, 257 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReporter.java
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
new file mode 100644
index 00000000000..7c95a477e91
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
@@ -0,0 +1,109 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.reporter;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
+import lombok.Getter;
+import lombok.Value;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JacksonXmlRootElement(localName = "coverage")
+public class GenericCoverageReport {
+
+  @JacksonXmlProperty(isAttribute = true)
+  @Getter
+  public final String version;
+
+  @JacksonXmlElementWrapper(useWrapping = false)
+  @Getter
+  public final List<GenericCoverageReportEntry> file;
+
+  public GenericCoverageReport(AnalysisInfo analysisInfo) {
+
+    version = "1";
+    file = new ArrayList<>();
+
+    for (FileInfo fileInfo : analysisInfo.getFileinfos()) {
+      file.add(new GenericCoverageReportEntry(fileInfo));
+    }
+  }
+
+  public GenericCoverageReport(
+    @JsonProperty("version") String version,
+    @JsonProperty("file") List<GenericCoverageReportEntry> file
+  ) {
+
+    this.version = version;
+    this.file = new ArrayList<>(file);
+  }
+
+  @Value
+  static class GenericCoverageReportEntry {
+
+    @JacksonXmlProperty(isAttribute = true)
+    public String path;
+
+    @JacksonXmlElementWrapper(useWrapping = false)
+    public List<LineToCoverEntry> lineToCover;
+
+    public GenericCoverageReportEntry(FileInfo fileInfo) {
+      this.path = fileInfo.getPath().toString();
+      this.lineToCover = new ArrayList<>();
+
+      for (int lineToCover : fileInfo.getMetrics().getCovlocData()) {
+        this.lineToCover.add(new LineToCoverEntry(lineToCover, false));
+      }
+    }
+
+    public GenericCoverageReportEntry(
+      @JsonProperty("path") String path,
+      @JsonProperty("version") List<LineToCoverEntry> lineToCover
+    ) {
+      this.path = path;
+      this.lineToCover = new ArrayList<>();
+    }
+  }
+
+  @Value
+  static class LineToCoverEntry {
+
+    @JacksonXmlProperty(isAttribute = true)
+    public int lineNumber;
+
+    @JacksonXmlProperty(isAttribute = true)
+    public boolean covered;
+
+    public LineToCoverEntry(
+      @JsonProperty("lineNumber") int lineNumber,
+      @JsonProperty("covered") boolean covered
+    ) {
+      this.covered = covered;
+      this.lineNumber = lineNumber;
+    }
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReporter.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReporter.java
new file mode 100644
index 00000000000..3bf8d3cb920
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReporter.java
@@ -0,0 +1,62 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.reporter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+
+@Slf4j
+public class GenericCoverageReporter extends AbstractDiagnosticReporter {
+
+  public static final String KEY = "genericCoverage";
+
+  public GenericCoverageReporter() {
+    super();
+  }
+
+  public GenericCoverageReporter(Path outputDir) {
+    super(outputDir);
+  }
+
+  @Override
+  public void report(AnalysisInfo analysisInfo) {
+
+    GenericCoverageReport report = new GenericCoverageReport(analysisInfo);
+
+    ObjectMapper mapper = new XmlMapper();
+    mapper.enable(SerializationFeature.INDENT_OUTPUT);
+
+    try {
+      File reportFile = new File(outputDir.toFile(), "genericCoverage.xml");
+      mapper.writeValue(reportFile, report);
+      LOGGER.info("Generic coverage report saved to {}", reportFile.getCanonicalPath());
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
index b916481fb58..21d6f1e8f05 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
@@ -69,6 +69,7 @@ private static Map<String, Class> reporterMap() {
     map.put(JUnitReporter.KEY, JUnitReporter.class);
     map.put(TSLintReporter.KEY, TSLintReporter.class);
     map.put(GenericIssueReporter.KEY, GenericIssueReporter.class);
+    map.put(GenericCoverageReporter.KEY, GenericCoverageReporter.class);
 
     return map;
   }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java
new file mode 100644
index 00000000000..30676b1da76
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java
@@ -0,0 +1,85 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.reporter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GenericCoverageTest {
+
+  private final File file = new File("./genericCoverage.xml");
+
+  @BeforeEach
+  void setUp() {
+    FileUtils.deleteQuietly(file);
+  }
+
+  @AfterEach
+  void tearDown() {
+    FileUtils.deleteQuietly(file);
+  }
+
+  @Test
+  void report() throws IOException {
+
+    // given
+    String sourceDir = ".";
+    String filePath = "./src/test/resources/context/DocumentContextLocForCoverTest.bsl";
+
+    // when
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile(filePath);
+    FileInfo fileInfo = new FileInfo(sourceDir, documentContext, new ArrayList<>());
+    AnalysisInfo analysisInfo = new AnalysisInfo(LocalDateTime.now(), Collections.singletonList(fileInfo), sourceDir);
+
+    AbstractDiagnosticReporter reporter = new GenericCoverageReporter();
+    reporter.report(analysisInfo);
+
+    // then
+    ObjectMapper mapper = new XmlMapper();
+    GenericCoverageReport report = mapper.readValue(file, GenericCoverageReport.class);
+
+    assertThat(report).isNotNull();
+    assertThat(report.version).isEqualTo("1");
+    assertThat(report.file.size()).isEqualTo(1);
+
+    GenericCoverageReport.GenericCoverageReportEntry fileEntry = report.file.get(0);
+
+    assertThat(fileEntry.getPath()).isEqualTo(fileInfo.getPath().toString());
+  }
+}

From 7caf3b04a49315c3900fadd39ab6791ff0d6cb1a Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 12:10:38 +0300
Subject: [PATCH 109/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20picocli?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |   4 +
 .../bsl/languageserver/BSLLSPLauncher.java    | 200 +++++++-----------
 .../languageserver/cli/AnalyzeCommand.java    |  90 ++++++--
 .../bsl/languageserver/cli/Command.java       |  32 ---
 .../bsl/languageserver/cli/FormatCommand.java |  39 +++-
 .../bsl/languageserver/cli/HelpCommand.java   |  54 -----
 .../cli/LanguageServerStartCommand.java       | 108 ----------
 .../cli/ParseExceptionCommand.java            |  54 -----
 ...rsionCommand.java => VersionProvider.java} |  25 +--
 .../languageserver/BSLLSPLauncherTest.java    |  30 +--
 .../cli/AnalyzeCommandTest.java               |  66 ------
 .../languageserver/cli/FormatCommandTest.java |  49 -----
 .../languageserver/cli/HelpCommandTest.java   |  38 ----
 .../cli/LanguageServerStartCommandTest.java   |  66 ------
 .../cli/ParseExceptionCommandTest.java        |  38 ----
 .../cli/VersionCommandTest.java               |  37 ----
 16 files changed, 202 insertions(+), 728 deletions(-)
 delete mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/Command.java
 delete mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommand.java
 delete mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
 delete mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommand.java
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/{VersionCommand.java => VersionProvider.java} (72%)
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommandTest.java
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommandTest.java
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommandTest.java
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommandTest.java
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommandTest.java
 delete mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommandTest.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 11e75582b2b..5311b31b78d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -57,6 +57,10 @@ dependencies {
 
     // https://mvnrepository.com/artifact/commons-cli/commons-cli
     implementation("commons-cli", "commons-cli", "1.4")
+
+    implementation("info.picocli", "picocli", "4.2.0")
+    annotationProcessor("info.picocli", "picocli", "4.2.0")
+
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation("commons-io", "commons-io", "2.6")
     implementation("org.apache.commons", "commons-lang3", "3.10")
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index e8b394b2e04..3b8afbc16f7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -22,135 +22,97 @@
 package com.github._1c_syntax.bsl.languageserver;
 
 import com.github._1c_syntax.bsl.languageserver.cli.AnalyzeCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.Command;
 import com.github._1c_syntax.bsl.languageserver.cli.FormatCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.HelpCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.LanguageServerStartCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.ParseExceptionCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.VersionCommand;
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
+import com.github._1c_syntax.bsl.languageserver.cli.VersionProvider;
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.launch.LSPLauncher;
+import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.lsp4j.services.LanguageClientAware;
+import org.eclipse.lsp4j.services.LanguageServer;
+import picocli.CommandLine;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Callable;
+
+@Slf4j
+@picocli.CommandLine.Command(
+  name = "",
+  description = "BSL language server on LSP server mode",
+  mixinStandardHelpOptions = true,
+  versionProvider = VersionProvider.class,
+  subcommands = {
+    AnalyzeCommand.class,
+    FormatCommand.class
+  },
+  usageHelpAutoWidth = true,
+  footer = "@|green Copyright(c) 2018-2020|@",
+  header = "@|green BSL language server|@")
+public class BSLLSPLauncher implements Callable<Integer> {
+
+  @picocli.CommandLine.Option(
+    names = {"-c", "--configuration"},
+    description = "Path to language server configuration file",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String configurationOption;
 
-public class BSLLSPLauncher {
+  public static void main(String[] args) {
+
+    int result = new CommandLine(new BSLLSPLauncher()).execute(args);
+    if (result >= 0) {
+      System.exit(result);
+    }
+  }
 
-  public static final String APP_NAME = "BSL language server";
+  public Integer call() {
+    File configurationFile = new File(configurationOption);
 
-  private static final Options options = createOptions();
+    LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
+    LanguageServer server = new BSLLanguageServer(configuration);
 
-  public static void main(String[] args) {
-    CommandLineParser parser = new DefaultParser();
+    Launcher<LanguageClient> launcher = getLanguageClientLauncher(server, configuration);
 
-    Command command;
-    try {
-      CommandLine cmd = parser.parse(options, args);
-
-      if (cmd.hasOption("help")) {
-        command = new HelpCommand(options);
-      } else if (cmd.hasOption("version")) {
-        command = new VersionCommand();
-      } else if (cmd.hasOption("analyze")) {
-        command = new AnalyzeCommand(cmd);
-      } else if (cmd.hasOption("format")) {
-        command = new FormatCommand(cmd);
-      } else {
-        command = new LanguageServerStartCommand(cmd);
-      }
+    LanguageClient client = launcher.getRemoteProxy();
+    ((LanguageClientAware) server).connect(client);
+
+    launcher.startListening();
+    return -1;
+  }
+
+  private static Launcher<LanguageClient> getLanguageClientLauncher(
+    LanguageServer server,
+    LanguageServerConfiguration configuration
+  ) {
+    InputStream in = System.in;
+    OutputStream out = System.out;
 
-    } catch (ParseException e) {
-      command = new ParseExceptionCommand(options, e);
+    File logFile = configuration.getTraceLog();
+    if (logFile == null) {
+      return LSPLauncher.createServerLauncher(server, in, out);
     }
 
-    int result = command.execute();
-    if (result >= 0) {
-      System.exit(result);
+    Launcher<LanguageClient> launcher;
+
+    try {
+      PrintWriter printWriter = new PrintWriter(logFile, StandardCharsets.UTF_8.name());
+      launcher = LSPLauncher.createServerLauncher(server, in, out, false, printWriter);
+    } catch (FileNotFoundException | UnsupportedEncodingException e) {
+      LOGGER.error("Can't create LSP trace file", e);
+      if (logFile.isDirectory()) {
+        LOGGER.error("Trace log setting must lead to file, not directory! {}", logFile.getAbsolutePath());
+      }
+
+      launcher = LSPLauncher.createServerLauncher(server, in, out);
     }
-  }
 
-  @VisibleForTesting
-  public static Options createOptions() {
-    Options createdOptions = new Options();
-
-    Option configurationOption = new Option(
-      "c",
-      "configuration",
-      true,
-      "Path to language server configuration file"
-    );
-    configurationOption.setRequired(false);
-
-    Option help = new Option(
-      "h",
-      "help",
-      false,
-      "Show help."
-    );
-
-    Option analyze = new Option(
-      "a",
-      "analyze",
-      false,
-      "Run analysis and get diagnostic info"
-    );
-
-    Option format = new Option(
-      "f",
-      "format",
-      false,
-      "Format files in source directory"
-    );
-
-    Option srcDir = new Option(
-      "s",
-      "srcDir",
-      true,
-      "Source directory"
-    );
-
-    Option reporter = new Option(
-      "r",
-      "reporter",
-      true,
-      "Reporter key"
-    );
-
-    Option outputDir = new Option(
-      "o",
-      "outputDir",
-      true,
-      "Output report directory"
-    );
-
-    Option version = new Option(
-      "v",
-      "version",
-      false,
-      "Show version."
-    );
-
-    Option silentMode = new Option(
-      "q",
-      "silent",
-      false,
-      "Silent mode"
-    );
-
-    createdOptions.addOption(analyze);
-    createdOptions.addOption(format);
-    createdOptions.addOption(srcDir);
-    createdOptions.addOption(outputDir);
-    createdOptions.addOption(reporter);
-    createdOptions.addOption(silentMode);
-
-    createdOptions.addOption(configurationOption);
-    createdOptions.addOption(help);
-    createdOptions.addOption(version);
-
-    return createdOptions;
+    return launcher;
   }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 638ef5c6334..ef04f4417dc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -28,12 +28,17 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.AnalysisInfo;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.ConsoleReporter;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.GenericIssueReporter;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.JUnitReporter;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.JsonReporter;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.ReportersAggregator;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.TSLintReporter;
 import com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider;
 import com.github._1c_syntax.utils.Absolute;
+import lombok.extern.slf4j.Slf4j;
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarStyle;
-import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Diagnostic;
 
@@ -42,9 +47,12 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
 /**
@@ -68,27 +76,74 @@
  * Выводимая информация:
  *  Выполняет анализ каталога исходных файлов и генерацию файлов отчета. Для каждого указанного ключа "Репортера"
  *  создается отдельный файл (каталог файлов). Реализованные "репортеры" находятся в пакете "reporter".
- */
-public class AnalyzeCommand implements Command {
+ **/
+@Slf4j
+@picocli.CommandLine.Command(
+  name = "analyze",
+  aliases = {"-a", "--analyze"},
+  description = "Run analysis and get diagnostic info",
+  mixinStandardHelpOptions = true,
+  usageHelpAutoWidth = true,
+  footer = "@|green Copyright(c) 2018-2020|@")
+public class AnalyzeCommand implements Callable<Integer> {
+
+  private static class ReportersKeys extends ArrayList<String> {
+    ReportersKeys() {
+      super(Arrays.asList(
+        ConsoleReporter.KEY,
+        JsonReporter.KEY,
+        JUnitReporter.KEY,
+        TSLintReporter.KEY,
+        GenericIssueReporter.KEY
+      ));
+    }
+  }
+
+  @picocli.CommandLine.Option(
+    names = {"-s", "--srcDir"},
+    description = "Source directory",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String srcDirOption;
+
+  @picocli.CommandLine.Option(
+    names = {"-o", "--outputDir"},
+    description = "Output report directory",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String outputDirOption;
+
+  @picocli.CommandLine.Option(
+    names = {"-c", "--configuration"},
+    description = "Path to language server configuration file",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String configurationOption;
+
+  @picocli.CommandLine.Option(
+    names = {"-r", "--reporter"},
+    paramLabel = "<keys>",
+    completionCandidates = ReportersKeys.class,
+    description = "Reporter key (${COMPLETION-CANDIDATES})")
+  private String[] reportersOptions;
+
+  @picocli.CommandLine.Option(
+    names = {"-q", "--silent"},
+    description = "Silent mode")
+  private boolean silentMode;
 
-  private final CommandLine cmd;
   private DiagnosticProvider diagnosticProvider;
   private ServerContext context;
 
-  public AnalyzeCommand(CommandLine cmd) {
-    this.cmd = cmd;
-  }
-
-  @Override
-  public int execute() {
-    String srcDirOption = cmd.getOptionValue("srcDir", "");
-    String outputDirOption = cmd.getOptionValue("outputDir", "");
-    String configurationOption = cmd.getOptionValue("configuration", "");
-    boolean silentMode = cmd.hasOption("silent");
+  public Integer call() {
 
     Path srcDir = Absolute.path(srcDirOption);
-    File configurationFile = new File(configurationOption);
+    if (!srcDir.toFile().exists()) {
+      LOGGER.error("Source dir `{}` is not exists", srcDir.toString());
+      return 1;
+    }
 
+    File configurationFile = new File(configurationOption);
     LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
 
     Path configurationPath = LanguageServerConfiguration.getCustomConfigurationRoot(configuration, srcDir);
@@ -114,9 +169,9 @@ public int execute() {
       }
     }
 
-    AnalysisInfo analysisInfo = new AnalysisInfo(LocalDateTime.now(), fileInfos, srcDirOption);
+    AnalysisInfo analysisInfo = new AnalysisInfo(LocalDateTime.now(), fileInfos, srcDir.toString());
     Path outputDir = Absolute.path(outputDirOption);
-    String[] reporters = Optional.ofNullable(cmd.getOptionValues("reporter")).orElse(new String[0]);
+    var reporters = Optional.ofNullable(reportersOptions).orElse(new String[0]);
     ReportersAggregator aggregator = new ReportersAggregator(outputDir, reporters);
     aggregator.report(analysisInfo);
     return 0;
@@ -144,5 +199,4 @@ private FileInfo getFileInfoFromFile(Path srcDir, File file) {
 
     return fileInfo;
   }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/Command.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/Command.java
deleted file mode 100644
index b235fd2b766..00000000000
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/Command.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-public interface Command {
-
-  /**
-   * Execute given command.
-   *
-   * @return Result code. 0 - if success, &gt;0 in case of error, &lt;0 in case of pending multithreaded task.
-   */
-  int execute();
-}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index 99d6cc4e31d..c2aaa364e18 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -26,9 +26,9 @@
 import com.github._1c_syntax.bsl.languageserver.providers.FormatProvider;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarStyle;
-import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.FormattingOptions;
@@ -40,6 +40,7 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Форматирование кода в исходниках
@@ -54,24 +55,42 @@
  *  Выполняет форматирование исходного кода в файлах каталога. Для форматирования используются правила и настройки
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.
  */
-public class FormatCommand implements Command {
+@Slf4j
+@picocli.CommandLine.Command(
+  name = "format",
+  aliases = {"-f", "--format"},
+  description = "Format files in source directory",
+  mixinStandardHelpOptions = true,
+  usageHelpAutoWidth = true,
+  footer = "@|green Copyright(c) 2018-2020|@")
+public class FormatCommand implements Callable<Integer> {
 
-  private final CommandLine cmd;
   private final ServerContext serverContext;
 
-  public FormatCommand(CommandLine cmd) {
-    this.cmd = cmd;
+  @picocli.CommandLine.Option(
+    names = {"-s", "--srcDir"},
+    description = "Source directory",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String srcDirOption;
+
+  @picocli.CommandLine.Option(
+    names = {"-q", "--silent"},
+    description = "Silent mode")
+  private boolean silentMode;
+
+  public FormatCommand() {
     this.serverContext = new ServerContext();
   }
 
-  @Override
-  public int execute() {
+  public Integer call() {
     serverContext.clear();
 
-    String srcDirOption = cmd.getOptionValue("srcDir", "");
-    boolean silentMode = cmd.hasOption("silent");
-
     Path srcDir = Absolute.path(srcDirOption);
+    if (!srcDir.toFile().exists()) {
+      LOGGER.error("Source dir `{}` is not exists", srcDir.toString());
+      return 1;
+    }
 
     Collection<File> files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommand.java
deleted file mode 100644
index 305af224e64..00000000000
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.APP_NAME;
-
-/**
- * Вывод справки
- * Ключ команды:
- *  -h, (--help)
- * Параметры:
- *  Без параметров
- * Выводимая информация:
- *  Выводит справку консольного приложения
- *
- */
-public class HelpCommand implements Command {
-
-  private final Options options;
-
-  public HelpCommand(Options options) {
-    this.options = options;
-  }
-
-  @Override
-  public int execute() {
-    HelpFormatter formatter = new HelpFormatter();
-
-    formatter.printHelp(APP_NAME, options, true);
-    return 0;
-  }
-}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
deleted file mode 100644
index d75ada08096..00000000000
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import com.github._1c_syntax.bsl.languageserver.BSLLanguageServer;
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.cli.CommandLine;
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.launch.LSPLauncher;
-import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.lsp4j.services.LanguageClientAware;
-import org.eclipse.lsp4j.services.LanguageServer;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Запускает приложение в режиме Language Server
- * Ключ команды:
- *  без ключа
- * Параметры:
- *  -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
- *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
- *                                то будут использованы настройки по умолчанию.
- * Выводимая информация:
- *  Данный режим используется для взаимодействия с клиентом по протоколу LSP.
- */
-@Slf4j
-public class LanguageServerStartCommand implements Command {
-
-  private final CommandLine cmd;
-
-  public LanguageServerStartCommand(CommandLine cmd) {
-    this.cmd = cmd;
-  }
-
-  @Override
-  public int execute() {
-
-    String configurationOption = cmd.getOptionValue("configuration", "");
-    File configurationFile = new File(configurationOption);
-
-    LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
-    LanguageServer server = new BSLLanguageServer(configuration);
-
-    Launcher<LanguageClient> launcher = getLanguageClientLauncher(server, configuration);
-
-    LanguageClient client = launcher.getRemoteProxy();
-    ((LanguageClientAware) server).connect(client);
-
-    launcher.startListening();
-    return -1;
-  }
-
-  private static Launcher<LanguageClient> getLanguageClientLauncher(
-    LanguageServer server,
-    LanguageServerConfiguration configuration
-  ) {
-    InputStream in = System.in;
-    OutputStream out = System.out;
-
-    File logFile = configuration.getTraceLog();
-    if (logFile == null) {
-      return LSPLauncher.createServerLauncher(server, in, out);
-    }
-
-    Launcher<LanguageClient> launcher;
-
-    try {
-      PrintWriter printWriter = new PrintWriter(logFile, StandardCharsets.UTF_8.name());
-      launcher = LSPLauncher.createServerLauncher(server, in, out, false, printWriter);
-    } catch (FileNotFoundException | UnsupportedEncodingException e) {
-      LOGGER.error("Can't create LSP trace file", e);
-      if (logFile.isDirectory()) {
-        LOGGER.error("Trace log setting must lead to file, not directory! {}", logFile.getAbsolutePath());
-      }
-
-      launcher = LSPLauncher.createServerLauncher(server, in, out);
-    }
-
-    return launcher;
-  }
-}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommand.java
deleted file mode 100644
index 6896ed6d245..00000000000
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.APP_NAME;
-
-/**
- * Служебный класс для обработки некорректных параметров командной строки
- */
-@Slf4j
-public class ParseExceptionCommand implements Command {
-
-  private final Options options;
-  private final ParseException e;
-
-  public ParseExceptionCommand(Options options, ParseException e) {
-    this.options = options;
-    this.e = e;
-  }
-
-  @Override
-  public int execute() {
-    HelpFormatter formatter = new HelpFormatter();
-
-    LOGGER.error(e.getMessage());
-    formatter.printHelp(APP_NAME, options, true);
-
-    return 1;
-  }
-}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java
similarity index 72%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java
index 3a5c4379deb..249813a7308 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java
@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver.cli;
 
 import lombok.extern.slf4j.Slf4j;
+import picocli.CommandLine;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,20 +30,13 @@
 import java.util.jar.Manifest;
 
 /**
- * Вывод версии приложения
- * Ключ команды:
- *  -v, (--version)
- * Параметры:
- *  Без параметров
- * Выводимая информация:
- *  Выводит версию приожения в консоль в формате "version: version_bslls"
+ * Читает версию из манифеста и формирует строку-версию приложения
  */
 @Slf4j
-public class VersionCommand implements Command {
+public class VersionProvider implements CommandLine.IVersionProvider {
 
   @Override
-  public int execute() {
-
+  public String[] getVersion() {
     final InputStream mfStream = Thread.currentThread()
       .getContextClassLoader()
       .getResourceAsStream("META-INF/MANIFEST.MF");
@@ -52,12 +46,13 @@ public int execute() {
       manifest.read(mfStream);
     } catch (IOException e) {
       LOGGER.error("Can't read manifest", e);
+      return new String[0];
     }
 
-    System.out.print(String.format(
-      "version: %s%n",
-      manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)
-    ));
-    return 0;
+    return new String[]{
+      String.format(
+        "version: %s%n",
+        manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)
+      )};
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 317d30ce095..618cdb582ea 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -51,25 +51,7 @@ void restoreStreams() {
   }
 
   @Test
-  @ExpectSystemExitWithStatus(0)
-  void testHelp() {
-    // given
-    String[] args = new String[]{"--help"};
-
-
-    // when
-    try {
-      BSLLSPLauncher.main(args);
-    } catch (RuntimeException ignored) {
-      // catch prevented system.exit call
-    }
-
-    // then
-    assertThat(outContent.toString()).containsIgnoringCase("usage: ");
-  }
-
-  @Test
-  @ExpectSystemExitWithStatus(1)
+  @ExpectSystemExitWithStatus(2)
   void testParseError() {
     // given
     String[] args = new String[]{"--error"};
@@ -82,14 +64,14 @@ void testParseError() {
     }
 
     // then
-    assertThat(errContent.toString()).containsIgnoringCase("Unrecognized option: --error");
+    assertThat(errContent.toString()).containsIgnoringCase("Unknown option: '--error'");
   }
 
   @Test
   @ExpectSystemExitWithStatus(0)
   void testAnalyze() {
     // given
-    String[] args = new String[]{"--analyze", "--srcDir", "./src/test/resources/cli"};
+    String[] args = "--analyze --srcDir ./src/test/resources/cli".split(" ");
 
     // when
     try {
@@ -109,7 +91,7 @@ void testAnalyze() {
   @ExpectSystemExitWithStatus(0)
   void testAnalyzeSilent() {
     // given
-    String[] args = new String[]{"--analyze", "--srcDir", "./src/test/resources/cli", "-q"};
+    String[] args = "--analyze --srcDir ./src/test/resources/cli -q".split(" ");
 
     // when
     try {
@@ -128,7 +110,7 @@ void testAnalyzeSilent() {
   @ExpectSystemExitWithStatus(0)
   void testFormat() {
     // given
-    String[] args = new String[]{"--format", "--srcDir", "./src/test/resources/cli"};
+    String[] args = "--format --srcDir ./src/test/resources/cli".split(" ");
 
     // when
     try {
@@ -148,7 +130,7 @@ void testFormat() {
   @ExpectSystemExitWithStatus(0)
   void testFormatSilent() {
     // given
-    String[] args = new String[]{"--format", "--srcDir", "./src/test/resources/cli", "-q"};
+    String[] args = "--format --srcDir ./src/test/resources/cli -q".split(" ");
 
     // when
     try {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommandTest.java
deleted file mode 100644
index 7b5da125798..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommandTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.junit.jupiter.api.Test;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.createOptions;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class AnalyzeCommandTest {
-
-  @Test
-  void testExecute() throws ParseException {
-    Options options = createOptions();
-
-    DefaultParser parser = new DefaultParser();
-    CommandLine commandLine = parser.parse(options, new String[]{"-s", "./src/test/resources/cli"});
-
-    Command command = new AnalyzeCommand(commandLine);
-
-    int result = command.execute();
-
-    assertThat(result).isEqualTo(0);
-  }
-
-  @Test
-  void testExecuteWithMetadata() throws ParseException {
-
-    Options options = createOptions();
-
-    DefaultParser parser = new DefaultParser();
-    CommandLine commandLine = parser.parse(
-      options, new String[]{"-s", "./src/test/resources/metadata"});
-
-    Command command = new AnalyzeCommand(commandLine);
-
-    int result = command.execute();
-
-    assertThat(result).isEqualTo(0);
-
-  }
-
-}
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommandTest.java
deleted file mode 100644
index b06a39f8b1e..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommandTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.junit.jupiter.api.Test;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.createOptions;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class FormatCommandTest {
-
-  @Test
-  void testExecute() throws ParseException {
-    Options options = createOptions();
-
-    DefaultParser parser = new DefaultParser();
-    CommandLine commandLine = parser.parse(options, new String[]{"-s", "./src/test/resources/cli"});
-
-    Command command = new FormatCommand(commandLine);
-
-    int result = command.execute();
-
-    assertThat(result).isEqualTo(0);
-  }
-
-}
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommandTest.java
deleted file mode 100644
index 7e0f7f37280..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/HelpCommandTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.junit.jupiter.api.Test;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.createOptions;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class HelpCommandTest {
-
-  @Test
-  void testExecute() {
-    Command command = new HelpCommand(createOptions());
-    int result = command.execute();
-
-    assertThat(result).isEqualTo(0);
-  }
-}
\ No newline at end of file
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommandTest.java
deleted file mode 100644
index 45962c1eef7..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommandTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.createOptions;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class LanguageServerStartCommandTest {
-
-  @BeforeEach
-  void startUp() throws IOException {
-    Files.deleteIfExists(Paths.get("build/.trace.log"));
-  }
-
-  @Test
-  void testExecute() throws ParseException {
-    Options options = createOptions();
-    DefaultParser parser = new DefaultParser();
-    CommandLine commandLine = parser.parse(options, new String[]{});
-    Command command = new LanguageServerStartCommand(commandLine);
-
-    int result = command.execute();
-    assertThat(result).isEqualTo(-1);
-  }
-
-  @Test
-  void testExecuteWithConfigurationFile() throws ParseException {
-    Options options = createOptions();
-    DefaultParser parser = new DefaultParser();
-    CommandLine commandLine = parser.parse(options, new String[]{"-c", "src/test/resources/.bsl-language-server.json"});
-    Command command = new LanguageServerStartCommand(commandLine);
-
-    int result = command.execute();
-    assertThat(result).isEqualTo(-1);
-  }
-}
\ No newline at end of file
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommandTest.java
deleted file mode 100644
index eba9e049f35..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/ParseExceptionCommandTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.apache.commons.cli.ParseException;
-import org.junit.jupiter.api.Test;
-
-import static com.github._1c_syntax.bsl.languageserver.BSLLSPLauncher.createOptions;
-import static org.assertj.core.api.Assertions.assertThat;
-
-class ParseExceptionCommandTest {
-
-  @Test
-  void testExecute() {
-    Command command = new ParseExceptionCommand(createOptions(), new ParseException(""));
-    int result = command.execute();
-    assertThat(result).isEqualTo(1);
-  }
-}
\ No newline at end of file
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommandTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommandTest.java
deleted file mode 100644
index 1b0ec2c7c47..00000000000
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommandTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is a part of BSL Language Server.
- *
- * Copyright © 2018-2020
- * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class VersionCommandTest {
-
-  @Test
-  void testExecute() {
-    Command command = new VersionCommand();
-    int result = command.execute();
-
-    assertThat(result).isEqualTo(0);
-  }
-}
\ No newline at end of file

From 8957952db7241815b269d419ceaed82f48183ca2 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 12:19:39 +0300
Subject: [PATCH 110/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=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

---
 README.md        | 59 +++++++++++++++++++++++++++++++++++-------------
 docs/en/index.md | 50 ++++++++++++++++++++++++++++++----------
 docs/index.md    | 49 ++++++++++++++++++++++++++++++----------
 3 files changed, 118 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index aea179d9510..cc07bb490f7 100644
--- a/README.md
+++ b/README.md
@@ -38,29 +38,43 @@
 ```sh
 java -jar bsl-language-server.jar --help
 
-usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <arg>]
- -a,--analyze               Run analysis and get diagnostic info
- -c,--configuration <arg>   Path to language server configuration file
- -f,--format                Format files in source directory
- -h,--help                  Show help.
- -o,--outputDir <arg>       Output report directory
- -r,--reporter <arg>        Reporter key
- -s,--srcDir <arg>          Source directory
- -v,--version               Version
- -q,--silent                Silent mode
+BSL language server
+Usage:  [-hV] [-c=<path>] [COMMAND]
+BSL language server on LSP server mode
+  -c, --configuration=<path>
+                  Path to language server configuration file
+  -h, --help      Show this help message and exit.
+  -V, --version   Print version information and exit.
+Commands:
+  analyze, -a, --analyze  Run analysis and get diagnostic info
+  format, -f, --format    Format files in source directory
 ```
 
-При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP](https://microsoft.github.io/language-server-protocol/). Для взаимодействия используются stdin и stdout.
+При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
 
 По умолчанию тексты диагностик выдаются на русском языке. Для переключения языка сообщений от движка диагностик необходимо настроить параметр `diagnosticLanguage` в конфигурационном файле или вызвав событие `workspace/didChangeConfiguration`:
 
+<a id="analyze"></a>
+
 ## Запуск в режиме анализатора
 
-Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
+Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
-Для формирования отчета об анализе требуется указать один или "репортеров". Для указания репортера используется параметр `--reporter` (сокращенно `-r`), за которым следует ключ репортера. Допустимо указывать несколько репортеров. 
+```sh
+Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Run analysis and get diagnostic info
+  -c, --configuration=<path>
+                           Path to language server configuration file
+  -h, --help               Show this help message and exit.
+  -o, --outputDir=<path>   Output report directory
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -s, --srcDir=<path>      Source directory
+  -V, --version            Print version information and exit.
+```
 
-Список и описания репортеров, диагностик, конфигурационного файла доступны [на сайте проекта](https://1c-syntax.github.io/bsl-language-server/).
+Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
+Для формирования отчета об анализе требуется указать один или "репортеров". Для указания репортера используется параметр `--reporter` (сокращенно `-r`), за которым следует ключ репортера. Допустимо указывать несколько репортеров. Список репортетов см. в разделе **Репортеры**.
 
 Пример строки запуска анализа:
 
@@ -74,11 +88,24 @@ java -jar bsl-language-server.jar --analyze --srcDir ./src/cf --reporter json
 java -Xmx4g -jar bsl-language-server.jar ...остальные параметры
 ```
 
+<a id="format"></a>
+
 ## Запуск в режиме форматтера
 
-Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`). Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
+Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
 
-Пример строки запуска анализа:
+```sh
+Usage:  format [-hqV] [-s=<path>]
+Format files in source directory
+  -h, --help            Show this help message and exit.
+  -q, --silent          Silent mode
+  -s, --srcDir=<path>   Source directory
+  -V, --version         Print version information and exit.
+```
+
+Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
+
+Пример строки запуска форматирования:
 
 ```sh
 java -jar bsl-language-server.jar --format --srcDir ./src/cf
diff --git a/docs/en/index.md b/docs/en/index.md
index 6d46285df71..2ae9bc07e1f 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -49,16 +49,16 @@ jar-files run through `java -jar path/to/file.jar`.
 ```sh
 java -jar bsl-language-server.jar --help
 
-usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <arg>]
- -a,--analyze               Run analysis and get diagnostic info
- -c,--configuration <arg>   Path to language server configuration file
- -f,--format                Format files in source directory
- -h,--help                  Show help.
- -o,--outputDir <arg>       Output report directory
- -r,--reporter <arg>        Reporter key
- -s,--srcDir <arg>          Source directory
- -v,--version               Version
- -q,--silent                Silent mode
+BSL language server
+Usage:  [-hV] [-c=<path>] [COMMAND]
+BSL language server on LSP server mode
+  -c, --configuration=<path>
+                  Path to language server configuration file
+  -h, --help      Show this help message and exit.
+  -V, --version   Print version information and exit.
+Commands:
+  analyze, -a, --analyze  Run analysis and get diagnostic info
+  format, -f, --format    Format files in source directory
 ```
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
@@ -69,7 +69,22 @@ By default diagnostics texts are displayed in Russian. To switch the diagnostics
 
 ## Run in analyzer mode
 
-To run in analyzer mode use parameter `--analyze` (short `-a`). To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
+To run in analyzer mode use parameter `--analyze` (short `-a`). 
+
+```sh
+Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Run analysis and get diagnostic info
+  -c, --configuration=<path>
+                           Path to language server configuration file
+  -h, --help               Show this help message and exit.
+  -o, --outputDir=<path>   Output report directory
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -s, --srcDir=<path>      Source directory
+  -V, --version            Print version information and exit.
+```
+
+To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
 
 To generate an analysis report you need to specify one or more reporters. To specify reporter use parameter `--reporter` or `-r`, followed by reporter key. You may specify several reporters. The list of reporters see in section  **Reporters**.
 
@@ -89,7 +104,18 @@ java -Xmx4g -jar bsl-language-server.jar ... other parameters
 
 ## Run in formatter mode
 
-To run in formatter mode use parameter `--format` (short `-f`). To set source code folder for formatting use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
+To run in formatter mode use parameter `--format` (short `-f`). 
+
+```sh
+Usage:  format [-hqV] [-s=<path>]
+Format files in source directory
+  -h, --help            Show this help message and exit.
+  -q, --silent          Silent mode
+  -s, --srcDir=<path>   Source directory
+  -V, --version         Print version information and exit.
+```
+
+To set source code folder for formatting use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
 
 Command line example to run formatting:
 
diff --git a/docs/index.md b/docs/index.md
index 20e94187313..1ea90b4c02f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -49,16 +49,16 @@
 ```sh
 java -jar bsl-language-server.jar --help
 
-usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <arg>]
- -a,--analyze               Run analysis and get diagnostic info
- -c,--configuration <arg>   Path to language server configuration file
- -f,--format                Format files in source directory
- -h,--help                  Show help.
- -o,--outputDir <arg>       Output report directory
- -r,--reporter <arg>        Reporter key
- -s,--srcDir <arg>          Source directory
- -v,--version               Version
- -q,--silent                Silent mode
+BSL language server
+Usage:  [-hV] [-c=<path>] [COMMAND]
+BSL language server on LSP server mode
+  -c, --configuration=<path>
+                  Path to language server configuration file
+  -h, --help      Show this help message and exit.
+  -V, --version   Print version information and exit.
+Commands:
+  analyze, -a, --analyze  Run analysis and get diagnostic info
+  format, -f, --format    Format files in source directory
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
@@ -69,8 +69,22 @@ usage: BSL language server [-a] [-c <arg>] [-f] [-h] [-o <arg>] [-r <arg>] [-s <
 
 ## Запуск в режиме анализатора
 
-Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
+Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
+```sh
+Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Run analysis and get diagnostic info
+  -c, --configuration=<path>
+                           Path to language server configuration file
+  -h, --help               Show this help message and exit.
+  -o, --outputDir=<path>   Output report directory
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -s, --srcDir=<path>      Source directory
+  -V, --version            Print version information and exit.
+```
+
+Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
 Для формирования отчета об анализе требуется указать один или "репортеров". Для указания репортера используется параметр `--reporter` (сокращенно `-r`), за которым следует ключ репортера. Допустимо указывать несколько репортеров. Список репортетов см. в разделе **Репортеры**.
 
 Пример строки запуска анализа:
@@ -89,7 +103,18 @@ java -Xmx4g -jar bsl-language-server.jar ...остальные параметр
 
 ## Запуск в режиме форматтера
 
-Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`). Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
+Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
+
+```sh
+Usage:  format [-hqV] [-s=<path>]
+Format files in source directory
+  -h, --help            Show this help message and exit.
+  -q, --silent          Silent mode
+  -s, --srcDir=<path>   Source directory
+  -V, --version         Print version information and exit.
+```
+
+Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
 
 Пример строки запуска форматирования:
 

From 7f08faaefc2c6c2732c225f50114df0ed610b478 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 13:32:26 +0300
Subject: [PATCH 111/444] =?UTF-8?q?=D0=94=D0=9E=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BA=20=D1=81=D0=B0=D0=BC=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BA=D0=BE=D0=BC=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=83=20=D0=B8=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B5=20=D0=B4=D0=BE=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B1=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 23 +++++++++---------
 docs/en/index.md                              | 23 +++++++++---------
 docs/index.md                                 | 23 +++++++++---------
 .../bsl/languageserver/BSLLSPLauncher.java    | 14 +++++++----
 .../languageserver/cli/AnalyzeCommand.java    | 10 ++++++--
 .../bsl/languageserver/cli/FormatCommand.java |  9 +++++--
 ...rsionProvider.java => VersionCommand.java} | 24 +++++++++++++------
 .../languageserver/BSLLSPLauncherTest.java    | 23 ++++++++++++++++--
 8 files changed, 96 insertions(+), 53 deletions(-)
 rename src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/{VersionProvider.java => VersionCommand.java} (76%)

diff --git a/README.md b/README.md
index cc07bb490f7..1ebd58b3e3c 100644
--- a/README.md
+++ b/README.md
@@ -39,15 +39,15 @@
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-hV] [-c=<path>] [COMMAND]
+Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
 BSL language server on LSP server mode
   -c, --configuration=<path>
-                  Path to language server configuration file
-  -h, --help      Show this help message and exit.
-  -V, --version   Print version information and exit.
+               Path to language server configuration file
+  -h, --help   Show this help message and exit
 Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
+  version, -v, --version  Print version
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
@@ -61,16 +61,16 @@ Commands:
 Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
 ```sh
-Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
+                [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
-  -h, --help               Show this help message and exit.
+  -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
   -s, --srcDir=<path>      Source directory
-  -V, --version            Print version information and exit.
+      --silent             Silent mode
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
@@ -95,12 +95,11 @@ java -Xmx4g -jar bsl-language-server.jar ...остальные параметр
 Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
 
 ```sh
-Usage:  format [-hqV] [-s=<path>]
+Usage:  format [-h] [--silent] [-s=<path>]
 Format files in source directory
-  -h, --help            Show this help message and exit.
-  -q, --silent          Silent mode
+  -h, --help            Show this help message and exit
   -s, --srcDir=<path>   Source directory
-  -V, --version         Print version information and exit.
+      --silent          Silent mode
 ```
 
 Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
diff --git a/docs/en/index.md b/docs/en/index.md
index 2ae9bc07e1f..3e381864672 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -50,15 +50,15 @@ jar-files run through `java -jar path/to/file.jar`.
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-hV] [-c=<path>] [COMMAND]
+Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
 BSL language server on LSP server mode
   -c, --configuration=<path>
-                  Path to language server configuration file
-  -h, --help      Show this help message and exit.
-  -V, --version   Print version information and exit.
+               Path to language server configuration file
+  -h, --help   Show this help message and exit
 Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
+  version, -v, --version  Print version
 ```
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
@@ -72,16 +72,16 @@ By default diagnostics texts are displayed in Russian. To switch the diagnostics
 To run in analyzer mode use parameter `--analyze` (short `-a`). 
 
 ```sh
-Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
+                [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
-  -h, --help               Show this help message and exit.
+  -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
   -s, --srcDir=<path>      Source directory
-  -V, --version            Print version information and exit.
+      --silent             Silent mode
 ```
 
 To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
@@ -107,12 +107,11 @@ java -Xmx4g -jar bsl-language-server.jar ... other parameters
 To run in formatter mode use parameter `--format` (short `-f`). 
 
 ```sh
-Usage:  format [-hqV] [-s=<path>]
+Usage:  format [-h] [--silent] [-s=<path>]
 Format files in source directory
-  -h, --help            Show this help message and exit.
-  -q, --silent          Silent mode
+  -h, --help            Show this help message and exit
   -s, --srcDir=<path>   Source directory
-  -V, --version         Print version information and exit.
+      --silent          Silent mode
 ```
 
 To set source code folder for formatting use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
diff --git a/docs/index.md b/docs/index.md
index 1ea90b4c02f..f220196ce59 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,15 +50,15 @@
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-hV] [-c=<path>] [COMMAND]
+Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
 BSL language server on LSP server mode
   -c, --configuration=<path>
-                  Path to language server configuration file
-  -h, --help      Show this help message and exit.
-  -V, --version   Print version information and exit.
+               Path to language server configuration file
+  -h, --help   Show this help message and exit
 Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
+  version, -v, --version  Print version
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
@@ -72,16 +72,16 @@ Commands:
 Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
 ```sh
-Usage:  analyze [-hqV] [-c=<path>] [-o=<path>] [-s=<path>] [-r=<keys>]...
+Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
+                [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
-  -h, --help               Show this help message and exit.
+  -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
   -s, --srcDir=<path>      Source directory
-  -V, --version            Print version information and exit.
+      --silent             Silent mode
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
@@ -106,12 +106,11 @@ java -Xmx4g -jar bsl-language-server.jar ...остальные параметр
 Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
 
 ```sh
-Usage:  format [-hqV] [-s=<path>]
+Usage:  format [-h] [--silent] [-s=<path>]
 Format files in source directory
-  -h, --help            Show this help message and exit.
-  -q, --silent          Silent mode
+  -h, --help            Show this help message and exit
   -s, --srcDir=<path>   Source directory
-  -V, --version         Print version information and exit.
+      --silent          Silent mode
 ```
 
 Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 3b8afbc16f7..843daeb03db 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -23,7 +23,7 @@
 
 import com.github._1c_syntax.bsl.languageserver.cli.AnalyzeCommand;
 import com.github._1c_syntax.bsl.languageserver.cli.FormatCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.VersionProvider;
+import com.github._1c_syntax.bsl.languageserver.cli.VersionCommand;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
@@ -46,17 +46,23 @@
 @picocli.CommandLine.Command(
   name = "",
   description = "BSL language server on LSP server mode",
-  mixinStandardHelpOptions = true,
-  versionProvider = VersionProvider.class,
   subcommands = {
     AnalyzeCommand.class,
-    FormatCommand.class
+    FormatCommand.class,
+    VersionCommand.class
   },
   usageHelpAutoWidth = true,
+  synopsisSubcommandLabel = "[COMMAND [ARGS]]",
   footer = "@|green Copyright(c) 2018-2020|@",
   header = "@|green BSL language server|@")
 public class BSLLSPLauncher implements Callable<Integer> {
 
+  @CommandLine.Option(
+    names = {"-h", "--help"},
+    usageHelp = true,
+    description = "Show this help message and exit")
+  boolean usageHelpRequested;
+
   @picocli.CommandLine.Option(
     names = {"-c", "--configuration"},
     description = "Path to language server configuration file",
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index ef04f4417dc..6636caa6bd0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -41,6 +41,7 @@
 import me.tongfei.progressbar.ProgressBarStyle;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Diagnostic;
+import picocli.CommandLine;
 
 import java.io.File;
 import java.io.IOException;
@@ -82,7 +83,6 @@
   name = "analyze",
   aliases = {"-a", "--analyze"},
   description = "Run analysis and get diagnostic info",
-  mixinStandardHelpOptions = true,
   usageHelpAutoWidth = true,
   footer = "@|green Copyright(c) 2018-2020|@")
 public class AnalyzeCommand implements Callable<Integer> {
@@ -99,6 +99,12 @@ private static class ReportersKeys extends ArrayList<String> {
     }
   }
 
+  @picocli.CommandLine.Option(
+    names = {"-h", "--help"},
+    usageHelp = true,
+    description = "Show this help message and exit")
+  boolean usageHelpRequested;
+
   @picocli.CommandLine.Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
@@ -128,7 +134,7 @@ private static class ReportersKeys extends ArrayList<String> {
   private String[] reportersOptions;
 
   @picocli.CommandLine.Option(
-    names = {"-q", "--silent"},
+    names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index c2aaa364e18..e36d4a1b67a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -60,13 +60,18 @@
   name = "format",
   aliases = {"-f", "--format"},
   description = "Format files in source directory",
-  mixinStandardHelpOptions = true,
   usageHelpAutoWidth = true,
   footer = "@|green Copyright(c) 2018-2020|@")
 public class FormatCommand implements Callable<Integer> {
 
   private final ServerContext serverContext;
 
+  @picocli.CommandLine.Option(
+    names = {"-h", "--help"},
+    usageHelp = true,
+    description = "Show this help message and exit")
+  boolean usageHelpRequested;
+
   @picocli.CommandLine.Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
@@ -75,7 +80,7 @@ public class FormatCommand implements Callable<Integer> {
   private String srcDirOption;
 
   @picocli.CommandLine.Option(
-    names = {"-q", "--silent"},
+    names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
similarity index 76%
rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java
rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
index 249813a7308..e6c8f6d3b3a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
@@ -26,17 +26,25 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.concurrent.Callable;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
 /**
- * Читает версию из манифеста и формирует строку-версию приложения
+ * Выводит версию приложения
+ * Ключ команды:
+ *  -v, (--version)
  */
 @Slf4j
-public class VersionProvider implements CommandLine.IVersionProvider {
+@picocli.CommandLine.Command(
+  name = "version",
+  aliases = {"-v", "--version"},
+  description = "Print version",
+  usageHelpAutoWidth = true,
+  footer = "@|green Copyright(c) 2018-2020|@")
+public class VersionCommand implements Callable<Integer> {
 
-  @Override
-  public String[] getVersion() {
+  public Integer call() {
     final InputStream mfStream = Thread.currentThread()
       .getContextClassLoader()
       .getResourceAsStream("META-INF/MANIFEST.MF");
@@ -46,13 +54,15 @@ public String[] getVersion() {
       manifest.read(mfStream);
     } catch (IOException e) {
       LOGGER.error("Can't read manifest", e);
-      return new String[0];
+      return 1;
     }
 
-    return new String[]{
+    System.out.print(
       String.format(
         "version: %s%n",
         manifest.getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION)
-      )};
+      ));
+
+    return 0;
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 618cdb582ea..72b5b961200 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -91,7 +91,7 @@ void testAnalyze() {
   @ExpectSystemExitWithStatus(0)
   void testAnalyzeSilent() {
     // given
-    String[] args = "--analyze --srcDir ./src/test/resources/cli -q".split(" ");
+    String[] args = "--analyze --srcDir ./src/test/resources/cli --silent".split(" ");
 
     // when
     try {
@@ -130,7 +130,7 @@ void testFormat() {
   @ExpectSystemExitWithStatus(0)
   void testFormatSilent() {
     // given
-    String[] args = "--format --srcDir ./src/test/resources/cli -q".split(" ");
+    String[] args = "--format --srcDir ./src/test/resources/cli --silent".split(" ");
 
     // when
     try {
@@ -145,6 +145,25 @@ void testFormatSilent() {
     assertThat(errContent.toString()).isEmpty();
   }
 
+  @Test
+  @ExpectSystemExitWithStatus(0)
+  void testVersion() {
+    // given
+    String[] args = {"-v"};
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).startsWith("version:");
+    assertThat(errContent.toString()).isEmpty();
+  }
+
   @Test
   void testWithoutParameters() {
     // given

From 696ba96d99c404fea614814e6b426c2895326815 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 15:38:44 +0300
Subject: [PATCH 112/444] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=BD=D1=83=D0=B6=D0=BD=D1=83=D1=8E=20=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=B8=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=83=20=D0=B8=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B0=D0=BD=D0=BD=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                   |  3 ---
 .../bsl/languageserver/BSLLSPLauncher.java         |  4 ++--
 .../bsl/languageserver/cli/AnalyzeCommand.java     | 14 +++++++-------
 .../bsl/languageserver/cli/FormatCommand.java      |  9 +++++----
 .../bsl/languageserver/cli/VersionCommand.java     |  1 -
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5311b31b78d..bc4fedf2b89 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -55,9 +55,6 @@ dependencies {
     // https://mvnrepository.com/artifact/org.languagetool/language-ru
     implementation("org.languagetool", "language-ru", "4.2")
 
-    // https://mvnrepository.com/artifact/commons-cli/commons-cli
-    implementation("commons-cli", "commons-cli", "1.4")
-
     implementation("info.picocli", "picocli", "4.2.0")
     annotationProcessor("info.picocli", "picocli", "4.2.0")
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 843daeb03db..39d1d42d4d7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -43,7 +43,7 @@
 import java.util.concurrent.Callable;
 
 @Slf4j
-@picocli.CommandLine.Command(
+@CommandLine.Command(
   name = "",
   description = "BSL language server on LSP server mode",
   subcommands = {
@@ -63,7 +63,7 @@ public class BSLLSPLauncher implements Callable<Integer> {
     description = "Show this help message and exit")
   boolean usageHelpRequested;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-c", "--configuration"},
     description = "Path to language server configuration file",
     paramLabel = "<path>",
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 6636caa6bd0..11d8eacee71 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -79,7 +79,7 @@
  *  создается отдельный файл (каталог файлов). Реализованные "репортеры" находятся в пакете "reporter".
  **/
 @Slf4j
-@picocli.CommandLine.Command(
+@CommandLine.Command(
   name = "analyze",
   aliases = {"-a", "--analyze"},
   description = "Run analysis and get diagnostic info",
@@ -99,41 +99,41 @@ private static class ReportersKeys extends ArrayList<String> {
     }
   }
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
   boolean usageHelpRequested;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String srcDirOption;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-o", "--outputDir"},
     description = "Output report directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String outputDirOption;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-c", "--configuration"},
     description = "Path to language server configuration file",
     paramLabel = "<path>",
     defaultValue = "")
   private String configurationOption;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-r", "--reporter"},
     paramLabel = "<keys>",
     completionCandidates = ReportersKeys.class,
     description = "Reporter key (${COMPLETION-CANDIDATES})")
   private String[] reportersOptions;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index e36d4a1b67a..f8590922695 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -33,6 +33,7 @@
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.TextEdit;
+import picocli.CommandLine;
 
 import java.io.File;
 import java.net.URI;
@@ -56,7 +57,7 @@
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.
  */
 @Slf4j
-@picocli.CommandLine.Command(
+@CommandLine.Command(
   name = "format",
   aliases = {"-f", "--format"},
   description = "Format files in source directory",
@@ -66,20 +67,20 @@ public class FormatCommand implements Callable<Integer> {
 
   private final ServerContext serverContext;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
   boolean usageHelpRequested;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String srcDirOption;
 
-  @picocli.CommandLine.Option(
+  @CommandLine.Option(
     names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
index e6c8f6d3b3a..f4b03416561 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
@@ -22,7 +22,6 @@
 package com.github._1c_syntax.bsl.languageserver.cli;
 
 import lombok.extern.slf4j.Slf4j;
-import picocli.CommandLine;
 
 import java.io.IOException;
 import java.io.InputStream;

From 39771bf2fb5665720fe40443df941b4251b75336 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 15:49:46 +0300
Subject: [PATCH 113/444] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=B2=D1=83=D1=8E=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=20+=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D0=BA?=
 =?UTF-8?q?=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B0=D0=BD=D0=BE=D1=82=D0=B0=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLSPLauncher.java    |  96 +------------
 .../languageserver/cli/AnalyzeCommand.java    |  18 +--
 .../bsl/languageserver/cli/FormatCommand.java |  12 +-
 .../cli/LanguageServerStartCommand.java       | 127 ++++++++++++++++++
 .../languageserver/cli/VersionCommand.java    |   3 +-
 5 files changed, 149 insertions(+), 107 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 39d1d42d4d7..3228ea8ea50 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -21,104 +21,14 @@
  */
 package com.github._1c_syntax.bsl.languageserver;
 
-import com.github._1c_syntax.bsl.languageserver.cli.AnalyzeCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.FormatCommand;
-import com.github._1c_syntax.bsl.languageserver.cli.VersionCommand;
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.launch.LSPLauncher;
-import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.lsp4j.services.LanguageClientAware;
-import org.eclipse.lsp4j.services.LanguageServer;
+import com.github._1c_syntax.bsl.languageserver.cli.LanguageServerStartCommand;
 import picocli.CommandLine;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.Callable;
-
-@Slf4j
-@CommandLine.Command(
-  name = "",
-  description = "BSL language server on LSP server mode",
-  subcommands = {
-    AnalyzeCommand.class,
-    FormatCommand.class,
-    VersionCommand.class
-  },
-  usageHelpAutoWidth = true,
-  synopsisSubcommandLabel = "[COMMAND [ARGS]]",
-  footer = "@|green Copyright(c) 2018-2020|@",
-  header = "@|green BSL language server|@")
-public class BSLLSPLauncher implements Callable<Integer> {
-
-  @CommandLine.Option(
-    names = {"-h", "--help"},
-    usageHelp = true,
-    description = "Show this help message and exit")
-  boolean usageHelpRequested;
-
-  @CommandLine.Option(
-    names = {"-c", "--configuration"},
-    description = "Path to language server configuration file",
-    paramLabel = "<path>",
-    defaultValue = "")
-  private String configurationOption;
-
+public class BSLLSPLauncher {
   public static void main(String[] args) {
-
-    int result = new CommandLine(new BSLLSPLauncher()).execute(args);
+    int result = new CommandLine(new LanguageServerStartCommand()).execute(args);
     if (result >= 0) {
       System.exit(result);
     }
   }
-
-  public Integer call() {
-    File configurationFile = new File(configurationOption);
-
-    LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
-    LanguageServer server = new BSLLanguageServer(configuration);
-
-    Launcher<LanguageClient> launcher = getLanguageClientLauncher(server, configuration);
-
-    LanguageClient client = launcher.getRemoteProxy();
-    ((LanguageClientAware) server).connect(client);
-
-    launcher.startListening();
-    return -1;
-  }
-
-  private static Launcher<LanguageClient> getLanguageClientLauncher(
-    LanguageServer server,
-    LanguageServerConfiguration configuration
-  ) {
-    InputStream in = System.in;
-    OutputStream out = System.out;
-
-    File logFile = configuration.getTraceLog();
-    if (logFile == null) {
-      return LSPLauncher.createServerLauncher(server, in, out);
-    }
-
-    Launcher<LanguageClient> launcher;
-
-    try {
-      PrintWriter printWriter = new PrintWriter(logFile, StandardCharsets.UTF_8.name());
-      launcher = LSPLauncher.createServerLauncher(server, in, out, false, printWriter);
-    } catch (FileNotFoundException | UnsupportedEncodingException e) {
-      LOGGER.error("Can't create LSP trace file", e);
-      if (logFile.isDirectory()) {
-        LOGGER.error("Trace log setting must lead to file, not directory! {}", logFile.getAbsolutePath());
-      }
-
-      launcher = LSPLauncher.createServerLauncher(server, in, out);
-    }
-
-    return launcher;
-  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 11d8eacee71..f5a43a55d23 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -41,7 +41,7 @@
 import me.tongfei.progressbar.ProgressBarStyle;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Diagnostic;
-import picocli.CommandLine;
+import picocli.CommandLine.Command;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,6 +56,8 @@
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
+import static picocli.CommandLine.Option;
+
 /**
  * Выполнение анализа
  * Ключ команды:
@@ -79,7 +81,7 @@
  *  создается отдельный файл (каталог файлов). Реализованные "репортеры" находятся в пакете "reporter".
  **/
 @Slf4j
-@CommandLine.Command(
+@Command(
   name = "analyze",
   aliases = {"-a", "--analyze"},
   description = "Run analysis and get diagnostic info",
@@ -99,41 +101,41 @@ private static class ReportersKeys extends ArrayList<String> {
     }
   }
 
-  @CommandLine.Option(
+  @Option(
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
   boolean usageHelpRequested;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String srcDirOption;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-o", "--outputDir"},
     description = "Output report directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String outputDirOption;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-c", "--configuration"},
     description = "Path to language server configuration file",
     paramLabel = "<path>",
     defaultValue = "")
   private String configurationOption;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-r", "--reporter"},
     paramLabel = "<keys>",
     completionCandidates = ReportersKeys.class,
     description = "Reporter key (${COMPLETION-CANDIDATES})")
   private String[] reportersOptions;
 
-  @CommandLine.Option(
+  @Option(
     names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index f8590922695..5c690ca14e7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -33,7 +33,6 @@
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.TextEdit;
-import picocli.CommandLine;
 
 import java.io.File;
 import java.net.URI;
@@ -43,6 +42,9 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 
+import static picocli.CommandLine.Command;
+import static picocli.CommandLine.Option;
+
 /**
  * Форматирование кода в исходниках
  * Ключ команды:
@@ -57,7 +59,7 @@
  *  "форматтера" FormatProvider, т.е. пользователь никак не может овлиять на результат.
  */
 @Slf4j
-@CommandLine.Command(
+@Command(
   name = "format",
   aliases = {"-f", "--format"},
   description = "Format files in source directory",
@@ -67,20 +69,20 @@ public class FormatCommand implements Callable<Integer> {
 
   private final ServerContext serverContext;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
   boolean usageHelpRequested;
 
-  @CommandLine.Option(
+  @Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
     paramLabel = "<path>",
     defaultValue = "")
   private String srcDirOption;
 
-  @CommandLine.Option(
+  @Option(
     names = {"--silent"},
     description = "Silent mode")
   private boolean silentMode;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
new file mode 100644
index 00000000000..ba733dc8fb1
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -0,0 +1,127 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.cli;
+
+import com.github._1c_syntax.bsl.languageserver.BSLLanguageServer;
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.launch.LSPLauncher;
+import org.eclipse.lsp4j.services.LanguageClient;
+import org.eclipse.lsp4j.services.LanguageClientAware;
+import org.eclipse.lsp4j.services.LanguageServer;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Callable;
+
+import static picocli.CommandLine.Command;
+import static picocli.CommandLine.Option;
+
+/**
+ * Запускает приложение в режиме Language Server
+ * Ключ команды:
+ *  без ключа
+ * Параметры:
+ * -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
+ *                                   Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
+ *                                   то будут использованы настройки по умолчанию.
+ * Выводимая информация:
+ *  Данный режим используется для взаимодействия с клиентом по протоколу LSP.
+ */
+@Slf4j
+@Command(
+  name = "",
+  description = "BSL language server on LSP server mode",
+  subcommands = {
+    AnalyzeCommand.class,
+    FormatCommand.class,
+    VersionCommand.class
+  },
+  usageHelpAutoWidth = true,
+  synopsisSubcommandLabel = "[COMMAND [ARGS]]",
+  footer = "@|green Copyright(c) 2018-2020|@",
+  header = "@|green BSL language server|@")
+public class LanguageServerStartCommand implements Callable<Integer> {
+  @Option(
+    names = {"-h", "--help"},
+    usageHelp = true,
+    description = "Show this help message and exit")
+  boolean usageHelpRequested;
+
+  @Option(
+    names = {"-c", "--configuration"},
+    description = "Path to language server configuration file",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String configurationOption;
+
+  public Integer call() {
+
+    File configurationFile = new File(configurationOption);
+
+    LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
+    LanguageServer server = new BSLLanguageServer(configuration);
+
+    Launcher<LanguageClient> launcher = getLanguageClientLauncher(server, configuration);
+
+    LanguageClient client = launcher.getRemoteProxy();
+    ((LanguageClientAware) server).connect(client);
+
+    launcher.startListening();
+    return -1;
+  }
+
+  private static Launcher<LanguageClient> getLanguageClientLauncher(
+    LanguageServer server,
+    LanguageServerConfiguration configuration
+  ) {
+    InputStream in = System.in;
+    OutputStream out = System.out;
+
+    File logFile = configuration.getTraceLog();
+    if (logFile == null) {
+      return LSPLauncher.createServerLauncher(server, in, out);
+    }
+
+    Launcher<LanguageClient> launcher;
+
+    try {
+      PrintWriter printWriter = new PrintWriter(logFile, StandardCharsets.UTF_8.name());
+      launcher = LSPLauncher.createServerLauncher(server, in, out, false, printWriter);
+    } catch (FileNotFoundException | UnsupportedEncodingException e) {
+      LOGGER.error("Can't create LSP trace file", e);
+      if (logFile.isDirectory()) {
+        LOGGER.error("Trace log setting must lead to file, not directory! {}", logFile.getAbsolutePath());
+      }
+
+      launcher = LSPLauncher.createServerLauncher(server, in, out);
+    }
+
+    return launcher;
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
index f4b03416561..4427a53b8ed 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/VersionCommand.java
@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver.cli;
 
 import lombok.extern.slf4j.Slf4j;
+import picocli.CommandLine.Command;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,7 +36,7 @@
  *  -v, (--version)
  */
 @Slf4j
-@picocli.CommandLine.Command(
+@Command(
   name = "version",
   aliases = {"-v", "--version"},
   description = "Print version",

From eb18448fbcc43776a17badf1d8312138db3ff957 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 17 Apr 2020 16:06:15 +0300
Subject: [PATCH 114/444] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=83=D1=87=D0=B5=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D0=B5=D1=80=D0=BE=D0=B2=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/cli/AnalyzeCommand.java   | 16 ++--------------
 .../bsl/languageserver/cli/FormatCommand.java    |  2 +-
 .../cli/LanguageServerStartCommand.java          |  2 +-
 .../reporter/ReportersAggregator.java            |  2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index f5a43a55d23..0a94fe5f271 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -28,12 +28,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.AnalysisInfo;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.ConsoleReporter;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.GenericIssueReporter;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.JUnitReporter;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.JsonReporter;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.ReportersAggregator;
-import com.github._1c_syntax.bsl.languageserver.diagnostics.reporter.TSLintReporter;
 import com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.extern.slf4j.Slf4j;
@@ -49,7 +44,6 @@
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -91,13 +85,7 @@ public class AnalyzeCommand implements Callable<Integer> {
 
   private static class ReportersKeys extends ArrayList<String> {
     ReportersKeys() {
-      super(Arrays.asList(
-        ConsoleReporter.KEY,
-        JsonReporter.KEY,
-        JUnitReporter.KEY,
-        TSLintReporter.KEY,
-        GenericIssueReporter.KEY
-      ));
+      super(ReportersAggregator.reporterMap().keySet());
     }
   }
 
@@ -105,7 +93,7 @@ private static class ReportersKeys extends ArrayList<String> {
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
-  boolean usageHelpRequested;
+  private boolean usageHelpRequested;
 
   @Option(
     names = {"-s", "--srcDir"},
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index 5c690ca14e7..e0f805bf94b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -73,7 +73,7 @@ public class FormatCommand implements Callable<Integer> {
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
-  boolean usageHelpRequested;
+  private boolean usageHelpRequested;
 
   @Option(
     names = {"-s", "--srcDir"},
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
index ba733dc8fb1..2be0ea78068 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -71,7 +71,7 @@ public class LanguageServerStartCommand implements Callable<Integer> {
     names = {"-h", "--help"},
     usageHelp = true,
     description = "Show this help message and exit")
-  boolean usageHelpRequested;
+  private boolean usageHelpRequested;
 
   @Option(
     names = {"-c", "--configuration"},
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
index b916481fb58..42bbaba7fa3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/ReportersAggregator.java
@@ -62,7 +62,7 @@ private void addReporterKeys(String[] reporterKeys) {
     }
   }
 
-  private static Map<String, Class> reporterMap() {
+  public static Map<String, Class> reporterMap() {
     Map<String, Class> map = new HashMap<>();
     map.put(ConsoleReporter.KEY, ConsoleReporter.class);
     map.put(JsonReporter.KEY, JsonReporter.class);

From e1a58b1fedff01a3667026a8fd3244b9a3de102e Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Mon, 20 Apr 2020 11:56:35 +0300
Subject: [PATCH 115/444] =?UTF-8?q?=D0=94=D0=9E=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLSPLauncher.java    | 73 ++++++++++++++++++-
 .../cli/LanguageServerStartCommand.java       | 14 +---
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 3228ea8ea50..2a9bcdf9240 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -21,14 +21,83 @@
  */
 package com.github._1c_syntax.bsl.languageserver;
 
+import com.github._1c_syntax.bsl.languageserver.cli.AnalyzeCommand;
+import com.github._1c_syntax.bsl.languageserver.cli.FormatCommand;
 import com.github._1c_syntax.bsl.languageserver.cli.LanguageServerStartCommand;
+import com.github._1c_syntax.bsl.languageserver.cli.VersionCommand;
+import org.jetbrains.annotations.NotNull;
 import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParameterException;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import static picocli.CommandLine.Command;
+
+@Command(
+  name = "bslls",
+  description = "BSL language server",
+  subcommands = {
+    AnalyzeCommand.class,
+    FormatCommand.class,
+    VersionCommand.class,
+    LanguageServerStartCommand.class
+  },
+  usageHelpAutoWidth = true,
+  synopsisSubcommandLabel = "[COMMAND [ARGS]]",
+  footer = "@|green Copyright(c) 2018-2020|@",
+  header = "@|green BSL language server|@")
+public class BSLLSPLauncher implements Callable<Integer> {
+
+  private static final String DEFAULT_COMMAND = "lsp";
+
+  @Option(
+    names = {"-h", "--help"},
+    usageHelp = true,
+    description = "Show this help message and exit")
+  private boolean usageHelpRequested;
 
-public class BSLLSPLauncher {
   public static void main(String[] args) {
-    int result = new CommandLine(new LanguageServerStartCommand()).execute(args);
+    var app = new BSLLSPLauncher();
+    var cmd = new CommandLine(app);
+
+    // проверка использования дефолтной команды
+    // если строка параметров пуста, то это точно вызов команды по умолчанию
+    if (args.length == 0) {
+      args = addDefaultCommand(args);
+    } else {
+      // выполнение проверки строки запуска в попытке, т.к. парсер при нахождении
+      // неизвестных параметров выдает ошибку
+      try {
+        cmd.parseArgs(args);
+      } catch (ParameterException ex) {
+        // если поймали ошибку, а имя команды не передано, подставим команду и посмотрим,
+        // вдруг заработает
+        if (!ex.getCommandLine().getParseResult().hasSubcommand()) {
+          args = addDefaultCommand(args);
+        }
+      }
+    }
+
+    int result = cmd.execute(args);
     if (result >= 0) {
       System.exit(result);
     }
   }
+
+  @NotNull
+  private static String[] addDefaultCommand(String[] args) {
+    List<String> tmpList = new ArrayList<>(Arrays.asList(args));
+    tmpList.add(0, DEFAULT_COMMAND);
+    args = tmpList.toArray(new String[0]);
+    return args;
+  }
+
+  public Integer call() {
+    // заглушка, командой как таковой не пользуемся
+    return 0;
+  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
index 2be0ea78068..d761afc7a46 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -55,17 +55,11 @@
  */
 @Slf4j
 @Command(
-  name = "",
-  description = "BSL language server on LSP server mode",
-  subcommands = {
-    AnalyzeCommand.class,
-    FormatCommand.class,
-    VersionCommand.class
-  },
+  name = "lsp",
+  aliases = {"--lsp"},
+  description = "LSP server mode",
   usageHelpAutoWidth = true,
-  synopsisSubcommandLabel = "[COMMAND [ARGS]]",
-  footer = "@|green Copyright(c) 2018-2020|@",
-  header = "@|green BSL language server|@")
+  footer = "@|green Copyright(c) 2018-2020|@")
 public class LanguageServerStartCommand implements Callable<Integer> {
   @Option(
     names = {"-h", "--help"},

From 2d788161ac3ef1bf7bab901e0018065c3b4e5bb3 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Mon, 20 Apr 2020 14:04:35 +0300
Subject: [PATCH 116/444] =?UTF-8?q?=D0=94=D0=9E=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/BSLLSPLauncherTest.java    | 52 +++++++++++++++++++
 src/test/resources/cli/error-trace.json       |  3 ++
 2 files changed, 55 insertions(+)
 create mode 100644 src/test/resources/cli/error-trace.json

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 72b5b961200..a6016064dff 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -106,6 +106,25 @@ void testAnalyzeSilent() {
     assertThat(errContent.toString()).isEmpty();
   }
 
+  @Test
+  @ExpectSystemExitWithStatus(1)
+  void testAnalyzeError() {
+    // given
+    String[] args = "--analyze --srcDir fake-dir".split(" ");
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).contains("is not exists");
+  }
+
   @Test
   @ExpectSystemExitWithStatus(0)
   void testFormat() {
@@ -145,6 +164,25 @@ void testFormatSilent() {
     assertThat(errContent.toString()).isEmpty();
   }
 
+  @Test
+  @ExpectSystemExitWithStatus(1)
+  void testFormatError() {
+    // given
+    String[] args = "--format --srcDir fake-dir".split(" ");
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).contains("is not exists");
+  }
+
   @Test
   @ExpectSystemExitWithStatus(0)
   void testVersion() {
@@ -177,4 +215,18 @@ void testWithoutParameters() {
     assertThat(outContent.toString()).isEmpty();
     assertThat(errContent.toString()).isEmpty();
   }
+
+  @Test
+  void testWithoutParametersErrorCfg() {
+    // given
+    String[] args = new String[]{"-c", "src/test/resources/cli/error-trace.json"};
+
+    // when
+    BSLLSPLauncher.main(args);
+
+    // then
+    // main-method should runs without exceptions
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).contains("Can't create LSP trace file");
+  }
 }
\ No newline at end of file
diff --git a/src/test/resources/cli/error-trace.json b/src/test/resources/cli/error-trace.json
new file mode 100644
index 00000000000..96bf15b0e35
--- /dev/null
+++ b/src/test/resources/cli/error-trace.json
@@ -0,0 +1,3 @@
+{
+  "traceLog": "build/"
+}

From 3d8792915b34644855c40164e6ac047c8520cce1 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 22 Apr 2020 08:34:44 +0300
Subject: [PATCH 117/444] Update build.gradle.kts

Co-Authored-By: Nikita Gryzlov <nixel2007@gmail.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bc4fedf2b89..ba41234ac01 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,7 +56,7 @@ dependencies {
     implementation("org.languagetool", "language-ru", "4.2")
 
     implementation("info.picocli", "picocli", "4.2.0")
-    annotationProcessor("info.picocli", "picocli", "4.2.0")
+    annotationProcessor("info.picocli", "picocli-codegen", "4.2.0")
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation("commons-io", "commons-io", "2.6")

From 9a17aa16f97c8f34996e55a28159ce9c1a1b6311 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 22 Apr 2020 08:34:56 +0300
Subject: [PATCH 118/444] Update
 src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java

Co-Authored-By: Nikita Gryzlov <nixel2007@gmail.com>
---
 .../github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index 2a9bcdf9240..bbbec506f22 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -38,7 +38,7 @@
 import static picocli.CommandLine.Command;
 
 @Command(
-  name = "bslls",
+  name = "bsl-language-server",
   description = "BSL language server",
   subcommands = {
     AnalyzeCommand.class,

From 99474dc077880fa9efffe672df498baa3b38babf Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 22 Apr 2020 08:35:03 +0300
Subject: [PATCH 119/444] Update
 src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java

Co-Authored-By: Nikita Gryzlov <nixel2007@gmail.com>
---
 .../bsl/languageserver/cli/LanguageServerStartCommand.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
index d761afc7a46..0466ff5e196 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -57,7 +57,7 @@
 @Command(
   name = "lsp",
   aliases = {"--lsp"},
-  description = "LSP server mode",
+  description = "LSP server mode (default)",
   usageHelpAutoWidth = true,
   footer = "@|green Copyright(c) 2018-2020|@")
 public class LanguageServerStartCommand implements Callable<Integer> {

From d571681eabb5ab921b160ba9799a39c82c235b22 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 22 Apr 2020 08:55:11 +0300
Subject: [PATCH 120/444] =?UTF-8?q?=D0=A2=D0=B0=D0=BA=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ba41234ac01..560d4686f15 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,7 +56,6 @@ dependencies {
     implementation("org.languagetool", "language-ru", "4.2")
 
     implementation("info.picocli", "picocli", "4.2.0")
-    annotationProcessor("info.picocli", "picocli-codegen", "4.2.0")
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
     implementation("commons-io", "commons-io", "2.6")

From 17df6b0b68982629b50709b6b7525c6e69faef03 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 22 Apr 2020 09:02:17 +0300
Subject: [PATCH 121/444] doc fix

---
 docs/diagnostics/TooManyReturns.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/diagnostics/TooManyReturns.md b/docs/diagnostics/TooManyReturns.md
index 613bc767c5b..407b821ae90 100644
--- a/docs/diagnostics/TooManyReturns.md
+++ b/docs/diagnostics/TooManyReturns.md
@@ -40,12 +40,6 @@
 ```
 
 ## Источники
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
-
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Why Many Return Statements Are a Bad Idea in OOP](https://www.yegor256.com/2015/08/18/multiple-return-statements-in-oop.html)
 * [JAVA: Methods should not have too many return statements](https://rules.sonarsource.com/java/RSPEC-1142)

From 94a794bb086b14daed731de063a9198082441b60 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 22:05:43 +0300
Subject: [PATCH 122/444] another npe fix

---
 .../diagnostics/DataExchangeLoadingDiagnostic.java    | 10 +++-------
 .../diagnostics/DataExchangeLoadingDiagnostic.bsl     | 11 +++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 2a692d5c736..0a79378fade 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -126,13 +126,9 @@ && foundReturnStatement(context))
   private static boolean foundReturnStatement(BSLParser.IfBranchContext ifBranch) {
 
     return Optional.ofNullable(ifBranch.codeBlock())
-      .map(BSLParser.CodeBlockContext::statement)
-      .flatMap(statementContexts -> statementContexts.stream()
-        .map(BSLParser.StatementContext::compoundStatement)
-        .map(BSLParser.CompoundStatementContext::returnStatement)
-        .map(Optional::ofNullable)
-        .findAny())
-      .isPresent();
+      .map(codeBlockContext -> Trees.findAllRuleNodes(codeBlockContext, BSLParser.RULE_returnStatement))
+      .map(list -> !list.isEmpty())
+      .orElse(false);
   }
 
   private static ParserRuleContext getSubContext(BSLParser.ProcDeclarationContext ctx) {
diff --git a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
index 37388ddc43f..ecc16ed6650 100644
--- a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
@@ -52,3 +52,14 @@ EndProcedure
         Возврат;
     КонецЕсли;
 КонецПроцедуры
+
+
+
+Процедура ПередЗаписью(Отказ, РежимЗаписи, РежимПроведения)
+
+	Если НЕ ОбменДанными.Загрузка И РольДоступна("ПолныеПрава")) И НЕ (ДополнительныеСвойства.Свойство("Обмен") И ДополнительныеСвойства.Обмен = Истина) Тогда
+		Отказ = Истина;
+		Возврат;
+	КонецЕсли;
+
+КонецПроцедуры
\ No newline at end of file

From 10cbe9fc35f91bee6e001aae384eb53dd086c0de Mon Sep 17 00:00:00 2001
From: Yuri Goncharuk <yukon39@gmail.com>
Date: Wed, 22 Apr 2020 13:42:17 +0300
Subject: [PATCH 123/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reporter/GenericCoverageReport.java       | 20 +++++++++----------
 .../reporter/GenericCoverageTest.java         | 14 ++++++++-----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
index 7c95a477e91..f3793d3ac11 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
@@ -26,22 +26,20 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
-import lombok.Getter;
 import lombok.Value;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @JacksonXmlRootElement(localName = "coverage")
+@Value
 public class GenericCoverageReport {
 
   @JacksonXmlProperty(isAttribute = true)
-  @Getter
-  public final String version;
+  final String version;
 
   @JacksonXmlElementWrapper(useWrapping = false)
-  @Getter
-  public final List<GenericCoverageReportEntry> file;
+  final List<GenericCoverageReportEntry> file;
 
   public GenericCoverageReport(AnalysisInfo analysisInfo) {
 
@@ -66,10 +64,10 @@ public GenericCoverageReport(
   static class GenericCoverageReportEntry {
 
     @JacksonXmlProperty(isAttribute = true)
-    public String path;
+    String path;
 
     @JacksonXmlElementWrapper(useWrapping = false)
-    public List<LineToCoverEntry> lineToCover;
+    List<LineToCoverEntry> lineToCover;
 
     public GenericCoverageReportEntry(FileInfo fileInfo) {
       this.path = fileInfo.getPath().toString();
@@ -82,10 +80,10 @@ public GenericCoverageReportEntry(FileInfo fileInfo) {
 
     public GenericCoverageReportEntry(
       @JsonProperty("path") String path,
-      @JsonProperty("version") List<LineToCoverEntry> lineToCover
+      @JsonProperty("lineToCover") List<LineToCoverEntry> lineToCover
     ) {
       this.path = path;
-      this.lineToCover = new ArrayList<>();
+      this.lineToCover = new ArrayList<>(lineToCover);
     }
   }
 
@@ -93,10 +91,10 @@ public GenericCoverageReportEntry(
   static class LineToCoverEntry {
 
     @JacksonXmlProperty(isAttribute = true)
-    public int lineNumber;
+    int lineNumber;
 
     @JacksonXmlProperty(isAttribute = true)
-    public boolean covered;
+    boolean covered;
 
     public LineToCoverEntry(
       @JsonProperty("lineNumber") int lineNumber,
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java
index 30676b1da76..0bc8b95cd39 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageTest.java
@@ -27,7 +27,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.FileInfo;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import org.apache.commons.io.FileUtils;
-import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +36,6 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -75,11 +73,17 @@ void report() throws IOException {
     GenericCoverageReport report = mapper.readValue(file, GenericCoverageReport.class);
 
     assertThat(report).isNotNull();
-    assertThat(report.version).isEqualTo("1");
-    assertThat(report.file.size()).isEqualTo(1);
+    assertThat(report.getVersion()).isEqualTo("1");
+    assertThat(report.getFile().size()).isEqualTo(1);
 
-    GenericCoverageReport.GenericCoverageReportEntry fileEntry = report.file.get(0);
+    GenericCoverageReport.GenericCoverageReportEntry fileEntry = report.getFile().get(0);
 
     assertThat(fileEntry.getPath()).isEqualTo(fileInfo.getPath().toString());
+    assertThat(fileEntry.getLineToCover().size()).isEqualTo(12);
+
+    GenericCoverageReport.LineToCoverEntry lineToCover = fileEntry.getLineToCover().get(0);
+
+    assertThat(lineToCover.getLineNumber()).isEqualTo(5);
+    assertThat(lineToCover.isCovered()).isFalse();
   }
 }

From 9a3eb47ae00bde0b7617d257da05915b363f380a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 22 Apr 2020 14:26:08 +0300
Subject: [PATCH 124/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B5=D0=B2=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BF-=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/scripts/benchmark.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/scripts/benchmark.py b/.github/scripts/benchmark.py
index 4f299a0761d..f4d0e8882ea 100644
--- a/.github/scripts/benchmark.py
+++ b/.github/scripts/benchmark.py
@@ -37,7 +37,9 @@ def createBSLLSConfiguration():
     newPath = thisPath + "/ssl/.bsl-language-server.json"
     data = {}
     data['configurationRoot'] = './src'
-    data['diagnostics'] = {'Typo': False}
+    data['diagnostics'] = {}
+    data['diagnostics']['mode'] = 'except'
+    data['diagnostics']['parameters'] = {'Typo': False}
 
     with open(newPath, 'w') as outfile:
         json.dump(data, outfile)

From f2515f0fc3549553d9c6c9e5343d60b47b14eb5f Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 22 Apr 2020 16:56:06 +0300
Subject: [PATCH 125/444] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=B4=D1=80=D0=B0=D1=84=D1=82=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedMethods8310.md     |  36 ++++++
 docs/diagnostics/index.md                     |   5 +-
 docs/en/diagnostics/DeprecatedMethods8310.md  |  36 ++++++
 docs/en/diagnostics/index.md                  |   5 +-
 .../DeprecatedMethods8310Diagnostic.java      | 111 ++++++++++++++++++
 .../configuration/parameters-schema.json      |  10 ++
 .../languageserver/configuration/schema.json  |   3 +
 ...recatedMethods8310Diagnostic_en.properties |   2 +
 ...recatedMethods8310Diagnostic_ru.properties |   2 +
 .../DeprecatedMethods8310DiagnosticTest.java  |  46 ++++++++
 .../DeprecatedMethods8310Diagnostic.bsl       |   3 +
 11 files changed, 255 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/DeprecatedMethods8310.md
 create mode 100644 docs/en/diagnostics/DeprecatedMethods8310.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl

diff --git a/docs/diagnostics/DeprecatedMethods8310.md b/docs/diagnostics/DeprecatedMethods8310.md
new file mode 100644
index 00000000000..0252bb30bdf
--- /dev/null
+++ b/docs/diagnostics/DeprecatedMethods8310.md
@@ -0,0 +1,36 @@
+# Использование устаревшего метода клиентского приложения (DeprecatedMethods8310)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Информационный` | `Да` | `1` | `deprecated` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:DeprecatedMethods8310-off
+// BSLLS:DeprecatedMethods8310-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"DeprecatedMethods8310": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 6dce551df6a..eac9427cc9b 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **92**
+Общее количество: **93**
 
-* Дефект кода: **57**
+* Дефект кода: **58**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
@@ -35,6 +35,7 @@
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
diff --git a/docs/en/diagnostics/DeprecatedMethods8310.md b/docs/en/diagnostics/DeprecatedMethods8310.md
new file mode 100644
index 00000000000..0e538b82967
--- /dev/null
+++ b/docs/en/diagnostics/DeprecatedMethods8310.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (DeprecatedMethods8310)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:DeprecatedMethods8310-off
+// BSLLS:DeprecatedMethods8310-on
+```
+
+### Parameter for config
+
+```json
+"DeprecatedMethods8310": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 659c900dc05..14be03cf5e4 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **92**
+Total: **93**
 
 * Error: **31**
-* Code smell: **57**
+* Code smell: **58**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -35,6 +35,7 @@ Total: **92**
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | <Diagnostic name> | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
new file mode 100644
index 00000000000..df5d0cfd020
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -0,0 +1,111 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
+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.DiagnosticScope;
+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 org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  scope = DiagnosticScope.BSL,
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_10,
+  tags = {
+    DiagnosticTag.DEPRECATED
+  }
+
+)
+public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String SET_SHORT_APPLICATION_CAPTION_RU = "УстановитьКраткийЗаголовокПриложения";
+  private static final String SET_SHORT_APPLICATION_CAPTION_EN = "SetShortApplicationCaption";
+  private static final String GET_SHORT_APPLICATION_CAPTION_RU = "ПолучитьКраткийЗаголовокПриложения";
+  private static final String GET_SHORT_APPLICATION_CAPTION_EN = "GetShortApplicationCaption";
+  private static final String SET_CLIENT_APPLICATION_CAPTION_RU = "УстановитьЗаголовокКлиентскогоПриложения";
+  private static final String SET_CLIENT_APPLICATION_CAPTION_EN = "SetClientApplicationCaption";
+  private static final String GET_CLIENT_APPLICATION_CAPTION_RU = "ПолучитьЗаголовокКлиентскогоПриложения";
+  private static final String GET_CLIENT_APPLICATION_CAPTION_EN = "GetClientApplicationCaption";
+  private static final String BASE_FONT_CURRENT_VARIANT_RU = "ТекущийВариантОсновногоШрифтаКлиентскогоПриложения";
+  private static final String BASE_FONT_CURRENT_VARIANT_EN = "ClientApplicationBaseFontCurrentVariant";
+  private static final String CLIENT_INTERFACE_VARIANT_RU = "ТекущийВариантИнтерфейсаКлиентскогоПриложения";
+  private static final String CLIENT_INTERFACE_VARIANT_EN = "ClientApplicationInterfaceCurrentVariant";
+  private static final String METHOD_PAIR = "%s|%s|";
+  private static final String REGEX = String.format(METHOD_PAIR +
+      METHOD_PAIR +
+      METHOD_PAIR +
+      METHOD_PAIR +
+      METHOD_PAIR +
+      "%s|%s"
+           , SET_SHORT_APPLICATION_CAPTION_RU, SET_SHORT_APPLICATION_CAPTION_EN
+           , GET_SHORT_APPLICATION_CAPTION_RU, GET_SHORT_APPLICATION_CAPTION_EN
+           , SET_CLIENT_APPLICATION_CAPTION_RU, SET_CLIENT_APPLICATION_CAPTION_EN
+           , GET_CLIENT_APPLICATION_CAPTION_RU, GET_CLIENT_APPLICATION_CAPTION_EN
+           , BASE_FONT_CURRENT_VARIANT_RU, BASE_FONT_CURRENT_VARIANT_EN
+           , CLIENT_INTERFACE_VARIANT_RU, CLIENT_INTERFACE_VARIANT_EN);
+  private static final Pattern METHOD_PATTERN = Pattern.compile(REGEX,
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final HashMap<String, String> newMethods = new HashMap<>();
+  static {
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.УстановитьКраткийЗаголовок");
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.ПолучитьКраткийЗаголовок");
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.УстановитьЗаголовок");
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.ПолучитьЗаголовок");
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_RU, "КлиентскоеПриложение.ТекущийВариантОсновногоШрифта");
+    newMethods.put(CLIENT_INTERFACE_VARIANT_RU, "КлиентскоеПриложение.ТекущийВариантИнтерфейса");
+
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_EN, "ClientApplication.SetShortCaption");
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_EN, "ClientApplication.GetShortCaption");
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_EN, "ClientApplication.SetCaption");
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_EN, "ClientApplication.GetCaption");
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_EN, "ClientApplication.CurrentBaseFontVariant");
+    newMethods.put(CLIENT_INTERFACE_VARIANT_EN, "ClientApplication.CurrentInterfaceVariant");
+  }
+
+  public DeprecatedMethods8310Diagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+
+    Matcher matcher = METHOD_PATTERN.matcher(ctx.methodName().getText());
+    if (matcher.matches()) {
+      diagnosticStorage.addDiagnostic(ctx,
+        info.getMessage(matcher.group(), newMethods.getOrDefault(matcher.group(), "")));
+    }
+
+    return super.visitGlobalMethodCall(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 6eb3492e4b4..f516b08d685 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
@@ -236,6 +236,16 @@
             "title": "Restriction on the use of deprecated \"Message\" method",
             "$id": "#/definitions/DeprecatedMessage"
         },
+        "DeprecatedMethods8310": {
+            "description": "<Diagnostic name>",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "<Diagnostic name>",
+            "$id": "#/definitions/DeprecatedMethods8310"
+        },
         "DeprecatedTypeManagedForm": {
             "description": "Deprecated ManagedForm type",
             "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 aa01b50a23f..e4e5668caff 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
@@ -77,6 +77,9 @@
                 "DeprecatedMessage": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedMessage"
                 },
+                "DeprecatedMethods8310": {
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedMethods8310"
+                },
                 "DeprecatedTypeManagedForm": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedTypeManagedForm"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_ru.properties
new file mode 100644
index 00000000000..dbbd77f67a8
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Метод "%s" устарел. Следует использовать "%s".
+diagnosticName=Использование устаревшего метода клиентского приложения
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
new file mode 100644
index 00000000000..b7f0ba2f6cc
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
@@ -0,0 +1,46 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class DeprecatedMethods8310DiagnosticTest extends AbstractDiagnosticTest<DeprecatedMethods8310Diagnostic> {
+  DeprecatedMethods8310DiagnosticTest() {
+    super(DeprecatedMethods8310Diagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(1, 31, 1, 78);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl
new file mode 100644
index 00000000000..fcca9dfa9c1
--- /dev/null
+++ b/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl
@@ -0,0 +1,3 @@
+Процедура Тест()
+    ТекущийВариантИнтерфейса = ТекущийВариантИнтерфейсаКлиентскогоПриложения();
+КонецПроцедуры

From 5894fabf5f2e4058dc6044fafa3aeaf5ecc758e9 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 22 Apr 2020 18:01:03 +0300
Subject: [PATCH 126/444] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0:?=
 =?UTF-8?q?=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=208.3.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedMethods8310.md     | 14 +++--
 docs/en/diagnostics/DeprecatedMethods8310.md  | 17 ++++--
 docs/en/diagnostics/index.md                  |  2 +-
 .../configuration/parameters-schema.json      |  4 +-
 ...recatedMethods8310Diagnostic_en.properties |  4 +-
 .../DeprecatedMethods8310DiagnosticTest.java  | 15 +++++-
 .../DeprecatedMethods8310Diagnostic.bsl       | 53 +++++++++++++++++++
 7 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/docs/diagnostics/DeprecatedMethods8310.md b/docs/diagnostics/DeprecatedMethods8310.md
index 0252bb30bdf..2fdf6d3e965 100644
--- a/docs/diagnostics/DeprecatedMethods8310.md
+++ b/docs/diagnostics/DeprecatedMethods8310.md
@@ -7,9 +7,16 @@
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-
-## Примеры
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+Следующие методы глобального контекста объявляены устаревшими и их использование не рекомендуется
+начиная с версии платформы 8.3.10: 
+```
+УстановитьКраткийЗаголовокПриложения();
+ПолучитьКраткийЗаголовокПриложения();
+УстановитьЗаголовокКлиентскогоПриложения(); 
+ПолучитьЗаголовокКлиентскогоПриложения();
+ТекущийВариантОсновногоШрифтаКлиентскогоПриложения(); 
+ТекущийВариантИнтерфейсаКлиентскогоПриложения().
+```
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
@@ -18,6 +25,7 @@
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+Источник: [Список изменений платформы 8.3.10:](https://dl03.1c.ru/content/Platform/8_3_10_2699/1cv8upd.htm)
 
 ## Сниппеты
 
diff --git a/docs/en/diagnostics/DeprecatedMethods8310.md b/docs/en/diagnostics/DeprecatedMethods8310.md
index 0e538b82967..325a4e26edd 100644
--- a/docs/en/diagnostics/DeprecatedMethods8310.md
+++ b/docs/en/diagnostics/DeprecatedMethods8310.md
@@ -1,4 +1,4 @@
-# <Diagnostic name> (DeprecatedMethods8310)
+# Deprecated client application method. (DeprecatedMethods8310)
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
@@ -7,10 +7,16 @@
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-
-## Examples
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
-
+The following global context methods are deprecated and are not recommended 
+since platform version 8.3.10:
+```
+SetShortApplicationCaption();
+GetShortApplicationCaption();
+SetClientApplicationCaption();
+GetClientApplicationCaption();
+ClientApplicationBaseFontCurrentVariant();
+ClientApplicationInterfaceCurrentVariant().
+```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -18,6 +24,7 @@
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+Source: [Version 8.3.10 changelog](https://dl03.1c.ru/content/Platform/8_3_10_2699/1cv8upd.htm)
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 14be03cf5e4..40af697dbe0 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -35,7 +35,7 @@ Total: **93**
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | <Diagnostic name> | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
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 f516b08d685..aab363c6a53 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
@@ -237,13 +237,13 @@
             "$id": "#/definitions/DeprecatedMessage"
         },
         "DeprecatedMethods8310": {
-            "description": "<Diagnostic name>",
+            "description": "Deprecated client application method.",
             "default": true,
             "type": [
                 "boolean",
                 "object"
             ],
-            "title": "<Diagnostic name>",
+            "title": "Deprecated client application method.",
             "$id": "#/definitions/DeprecatedMethods8310"
         },
         "DeprecatedTypeManagedForm": {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
index 66831715dfd..90ba23ca9b8 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Method "%s" is deprecated. You should use "%s".
+diagnosticName=Deprecated client application method.
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
index b7f0ba2f6cc..acbb1a33903 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310DiagnosticTest.java
@@ -38,9 +38,20 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics).hasSize(12);
     assertThat(diagnostics, true)
-      .hasRange(1, 31, 1, 78);
+      .hasRange(1, 31, 1, 78)
+      .hasRange(5, 31, 5, 67)
+      .hasRange(9, 31, 9, 73)
+      .hasRange(13, 31, 13, 71)
+      .hasRange(17, 31, 17, 83)
+      .hasRange(21, 31, 21, 78)
+      .hasRange(25, 11, 25, 39)
+      .hasRange(30, 11, 30, 39)
+      .hasRange(35, 11, 35, 40)
+      .hasRange(40, 11, 40, 40)
+      .hasRange(45, 11, 45, 52)
+      .hasRange(50, 11, 50, 53);
 
   }
 }
diff --git a/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl
index fcca9dfa9c1..e4761ea79c4 100644
--- a/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethods8310Diagnostic.bsl
@@ -1,3 +1,56 @@
 Процедура Тест()
     ТекущийВариантИнтерфейса = ТекущийВариантИнтерфейсаКлиентскогоПриложения();
 КонецПроцедуры
+
+Процедура Тест()
+    ТекущийВариантИнтерфейса = ПолучитьКраткийЗаголовокПриложения();
+КонецПроцедуры
+
+Процедура Тест()
+    ТекущийВариантИнтерфейса = УстановитьЗаголовокКлиентскогоПриложения();
+КонецПроцедуры
+
+Процедура Тест()
+    ТекущийВариантИнтерфейса = ПолучитьЗаголовокКлиентскогоПриложения();
+КонецПроцедуры
+
+Процедура Тест()
+    ТекущийВариантИнтерфейса = ТекущийВариантОсновногоШрифтаКлиентскогоПриложения();
+КонецПроцедуры
+
+Процедура Тест()
+    ТекущийВариантИнтерфейса = ТекущийВариантИнтерфейсаКлиентскогоПриложения();
+КонецПроцедуры
+
+Procedure Test()
+    test = SetShortApplicationCaption();
+    return;
+EndProcedure
+
+Procedure Test()
+    test = GetShortApplicationCaption();
+    return;
+EndProcedure
+
+Procedure Test()
+    test = SetClientApplicationCaption();
+    return;
+EndProcedure
+
+Procedure Test()
+    test = GetClientApplicationCaption();
+    return;
+EndProcedure
+
+Procedure Test()
+    test = ClientApplicationBaseFontCurrentVariant();
+    return;
+EndProcedure
+
+Procedure Test()
+    test = ClientApplicationInterfaceCurrentVariant();
+    return;
+EndProcedure
+
+
+

From d1a4a1d1b9501aa8adfe8fb7dd2fb8be4573c882 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 22 Apr 2020 19:20:04 +0300
Subject: [PATCH 127/444] =?UTF-8?q?=D0=BA=D0=B5=D0=B9=D1=81=20=D0=B2=20?=
 =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataExchangeLoadingDiagnosticTest.java       | 12 +++++++++---
 .../DataExchangeLoadingDiagnostic.bsl            | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
index 39bd6d671d9..fa742f99ae5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnosticTest.java
@@ -48,11 +48,17 @@ void test() {
 
     // then
     assertThat(diagnostics)
-      .hasSize(2)
+      .hasSize(3)
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
         Ranges.create(7, 10, 7, 22)))
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
-        Ranges.create(19, 10, 19, 17)));
+        Ranges.create(19, 10, 19, 17)))
+      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+        Ranges.create(70, 10, 70, 22)))
+    //fix me "Если НЕ обменданными"
+//      .anyMatch(diagnostic -> diagnostic.getRange().equals(
+//        Ranges.create(57, 10, 57, 22)));
+    ;
 
     // Проверяем с включенным параметром findFirst
     // when
@@ -63,7 +69,7 @@ void test() {
 
     // then
     assertThat(diagnostics)
-      .hasSize(3)
+      .hasSize(4)
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
         Ranges.create(7, 10, 7, 22)))
       .anyMatch(diagnostic -> diagnostic.getRange().equals(
diff --git a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
index ecc16ed6650..e921c47d59a 100644
--- a/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DataExchangeLoadingDiagnostic.bsl
@@ -57,9 +57,21 @@ EndProcedure
 
 Процедура ПередЗаписью(Отказ, РежимЗаписи, РежимПроведения)
 
-	Если НЕ ОбменДанными.Загрузка И РольДоступна("ПолныеПрава")) И НЕ (ДополнительныеСвойства.Свойство("Обмен") И ДополнительныеСвойства.Обмен = Истина) Тогда
+	Если НЕ ОбменДанными.Загрузка И РольДоступна("ПолныеПрава") И НЕ (ДополнительныеСвойства.Свойство("Обмен") И ДополнительныеСвойства.Обмен = Истина) Тогда
 		Отказ = Истина;
 		Возврат;
 	КонецЕсли;
 
-КонецПроцедуры
\ No newline at end of file
+КонецПроцедуры
+
+Процедура просто()
+
+КонецПроцедуры
+
+Процедура ПередЗаписью(Отказ, РежимЗаписи, РежимПроведения)
+
+	Если ОбменДанными.Загрузка Тогда
+	КонецЕсли;
+
+КонецПроцедуры
+

From 4280c6aaf02f3b9721b1c56cf6226cd1edb7bc36 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Thu, 23 Apr 2020 10:14:56 +0300
Subject: [PATCH 128/444] =?UTF-8?q?=D0=93=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=D1=8B=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedMethods8310Diagnostic.java      | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
index df5d0cfd020..2576e6fd086 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -60,20 +60,8 @@ public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
   private static final String BASE_FONT_CURRENT_VARIANT_EN = "ClientApplicationBaseFontCurrentVariant";
   private static final String CLIENT_INTERFACE_VARIANT_RU = "ТекущийВариантИнтерфейсаКлиентскогоПриложения";
   private static final String CLIENT_INTERFACE_VARIANT_EN = "ClientApplicationInterfaceCurrentVariant";
-  private static final String METHOD_PAIR = "%s|%s|";
-  private static final String REGEX = String.format(METHOD_PAIR +
-      METHOD_PAIR +
-      METHOD_PAIR +
-      METHOD_PAIR +
-      METHOD_PAIR +
-      "%s|%s"
-           , SET_SHORT_APPLICATION_CAPTION_RU, SET_SHORT_APPLICATION_CAPTION_EN
-           , GET_SHORT_APPLICATION_CAPTION_RU, GET_SHORT_APPLICATION_CAPTION_EN
-           , SET_CLIENT_APPLICATION_CAPTION_RU, SET_CLIENT_APPLICATION_CAPTION_EN
-           , GET_CLIENT_APPLICATION_CAPTION_RU, GET_CLIENT_APPLICATION_CAPTION_EN
-           , BASE_FONT_CURRENT_VARIANT_RU, BASE_FONT_CURRENT_VARIANT_EN
-           , CLIENT_INTERFACE_VARIANT_RU, CLIENT_INTERFACE_VARIANT_EN);
-  private static final Pattern METHOD_PATTERN = Pattern.compile(REGEX,
+
+  private static final Pattern METHOD_PATTERN = Pattern.compile(getRegex(),
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final HashMap<String, String> newMethods = new HashMap<>();
@@ -93,6 +81,26 @@ public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
     newMethods.put(CLIENT_INTERFACE_VARIANT_EN, "ClientApplication.CurrentInterfaceVariant");
   }
 
+  private static String getRegex() {
+    HashMap<String, String> methodsPair = new HashMap<>();
+    methodsPair.put(SET_SHORT_APPLICATION_CAPTION_RU, SET_SHORT_APPLICATION_CAPTION_EN);
+    methodsPair.put(GET_SHORT_APPLICATION_CAPTION_RU, GET_SHORT_APPLICATION_CAPTION_EN);
+    methodsPair.put(SET_CLIENT_APPLICATION_CAPTION_RU, SET_CLIENT_APPLICATION_CAPTION_EN);
+    methodsPair.put(GET_CLIENT_APPLICATION_CAPTION_RU, GET_CLIENT_APPLICATION_CAPTION_EN);
+    methodsPair.put(BASE_FONT_CURRENT_VARIANT_RU, BASE_FONT_CURRENT_VARIANT_EN);
+    methodsPair.put(CLIENT_INTERFACE_VARIANT_RU, CLIENT_INTERFACE_VARIANT_EN);
+    StringBuilder regex = new StringBuilder();
+
+    methodsPair.forEach((k, v) -> {
+      regex.append(k);
+      regex.append("|");
+      regex.append(v);
+      regex.append("|");
+    });
+
+    return regex.toString().substring(0, regex.length() - 1);
+  }
+
   public DeprecatedMethods8310Diagnostic(DiagnosticInfo info) {
     super(info);
   }

From a17129eac45dea7291368e3bfd4f351738b36c4a Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Thu, 23 Apr 2020 11:14:48 +0300
Subject: [PATCH 129/444] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?StringBuilder=20=D0=BD=D0=B0=20StringJoiner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DeprecatedMethods8310Diagnostic.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
index 2576e6fd086..307dc884194 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -32,6 +32,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
+import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -89,16 +90,14 @@ private static String getRegex() {
     methodsPair.put(GET_CLIENT_APPLICATION_CAPTION_RU, GET_CLIENT_APPLICATION_CAPTION_EN);
     methodsPair.put(BASE_FONT_CURRENT_VARIANT_RU, BASE_FONT_CURRENT_VARIANT_EN);
     methodsPair.put(CLIENT_INTERFACE_VARIANT_RU, CLIENT_INTERFACE_VARIANT_EN);
-    StringBuilder regex = new StringBuilder();
+    StringJoiner regex = new StringJoiner("|");
 
     methodsPair.forEach((k, v) -> {
-      regex.append(k);
-      regex.append("|");
-      regex.append(v);
-      regex.append("|");
+      regex.add(k);
+      regex.add(v);
     });
 
-    return regex.toString().substring(0, regex.length() - 1);
+    return regex.toString();
   }
 
   public DeprecatedMethods8310Diagnostic(DiagnosticInfo info) {

From 0159fec2943fb466fc4a0f0bcc13474c756cb05e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 23 Apr 2020 12:45:26 +0300
Subject: [PATCH 130/444] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BF=D1=83=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20-q?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java       | 2 +-
 .../github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 0a94fe5f271..76b5e3b5ae1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -124,7 +124,7 @@ private static class ReportersKeys extends ArrayList<String> {
   private String[] reportersOptions;
 
   @Option(
-    names = {"--silent"},
+    names = {"-q", "--silent"},
     description = "Silent mode")
   private boolean silentMode;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
index e0f805bf94b..ac9270a1beb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java
@@ -83,7 +83,7 @@ public class FormatCommand implements Callable<Integer> {
   private String srcDirOption;
 
   @Option(
-    names = {"--silent"},
+    names = {"-q", "--silent"},
     description = "Silent mode")
   private boolean silentMode;
 

From 8e63625226f86276bf9c4af568b0ceeda7169ed2 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 23 Apr 2020 12:45:49 +0300
Subject: [PATCH 131/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20-c=20=D0=B2=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD?=
 =?UTF-8?q?=D1=83=D1=8E=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83,=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=B1=D1=8B=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BB=D0=BE=D0=B2=D0=B5=D1=87=D0=B5=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_1c_syntax/bsl/languageserver/BSLLSPLauncher.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index bbbec506f22..c941a06572c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -60,6 +60,13 @@ public class BSLLSPLauncher implements Callable<Integer> {
     description = "Show this help message and exit")
   private boolean usageHelpRequested;
 
+  @Option(
+    names = {"-c", "--configuration"},
+    description = "Path to language server configuration file",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String configurationOption;
+
   public static void main(String[] args) {
     var app = new BSLLSPLauncher();
     var cmd = new CommandLine(app);

From 437907c3f41fb90e04ca8a548be115518f1f92fc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 23 Apr 2020 12:46:01 +0300
Subject: [PATCH 132/444] =?UTF-8?q?=D0=9A=D1=80=D0=B0=D1=81=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=20=D0=B8=20=D0=B4=D0=BE=D0=BA=D1=83?=
 =?UTF-8?q?=D0=BC=D0=B5=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

---
 README.md                                      | 18 +++++++++---------
 docs/en/index.md                               | 16 ++++++++--------
 docs/index.md                                  | 16 ++++++++--------
 .../bsl/languageserver/BSLLSPLauncher.java     |  1 -
 .../cli/LanguageServerStartCommand.java        |  4 ++--
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 1ebd58b3e3c..a4571c94557 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,7 @@
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
-BSL language server on LSP server mode
+Usage: bsl-language-server [-h] [-c=<path>] [COMMAND [ARGS]]
   -c, --configuration=<path>
                Path to language server configuration file
   -h, --help   Show this help message and exit
@@ -48,6 +47,7 @@ Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
   version, -v, --version  Print version
+  lsp, --lsp              LSP server mode (default)
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
@@ -61,16 +61,16 @@ Commands:
 Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
 ```sh
-Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
-                [-r=<keys>]...
+Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]
+                                   [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
   -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
-      --silent             Silent mode
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
@@ -95,11 +95,11 @@ java -Xmx4g -jar bsl-language-server.jar ...остальные параметр
 Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
 
 ```sh
-Usage:  format [-h] [--silent] [-s=<path>]
+Usage: bsl-language-server format [-hq] [-s=<path>]
 Format files in source directory
   -h, --help            Show this help message and exit
+  -q, --silent          Silent mode
   -s, --srcDir=<path>   Source directory
-      --silent          Silent mode
 ```
 
 Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
@@ -141,7 +141,7 @@ java -jar bsl-language-server.jar --format --srcDir ./src/cf
 * Автодополнение методов текущего модуля
 * Автодополнение контекстных методов (конфигурация 1С и OneScript)
 * Сигнатура функций
-* Подброная всплывающая подсказка по методам
+* Подробная всплывающая подсказка по методам
 * Переход к определению
 * Поиск мест использования
 * Предпросмотр определения процедуры
diff --git a/docs/en/index.md b/docs/en/index.md
index 3e381864672..d389022690c 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -50,8 +50,7 @@ jar-files run through `java -jar path/to/file.jar`.
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
-BSL language server on LSP server mode
+Usage: bsl-language-server [-h] [-c=<path>] [COMMAND [ARGS]]
   -c, --configuration=<path>
                Path to language server configuration file
   -h, --help   Show this help message and exit
@@ -59,6 +58,7 @@ Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
   version, -v, --version  Print version
+  lsp, --lsp              LSP server mode (default)
 ```
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
@@ -72,16 +72,16 @@ By default diagnostics texts are displayed in Russian. To switch the diagnostics
 To run in analyzer mode use parameter `--analyze` (short `-a`). 
 
 ```sh
-Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
-                [-r=<keys>]...
+Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]
+                                   [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
   -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
-      --silent             Silent mode
 ```
 
 To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
@@ -107,11 +107,11 @@ java -Xmx4g -jar bsl-language-server.jar ... other parameters
 To run in formatter mode use parameter `--format` (short `-f`). 
 
 ```sh
-Usage:  format [-h] [--silent] [-s=<path>]
+Usage: bsl-language-server format [-hq] [-s=<path>]
 Format files in source directory
   -h, --help            Show this help message and exit
+  -q, --silent          Silent mode
   -s, --srcDir=<path>   Source directory
-      --silent          Silent mode
 ```
 
 To set source code folder for formatting use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
diff --git a/docs/index.md b/docs/index.md
index f220196ce59..89819fd003a 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,8 +50,7 @@
 java -jar bsl-language-server.jar --help
 
 BSL language server
-Usage:  [-h] [-c=<path>] [COMMAND [ARGS]]
-BSL language server on LSP server mode
+Usage: bsl-language-server [-h] [-c=<path>] [COMMAND [ARGS]]
   -c, --configuration=<path>
                Path to language server configuration file
   -h, --help   Show this help message and exit
@@ -59,6 +58,7 @@ Commands:
   analyze, -a, --analyze  Run analysis and get diagnostic info
   format, -f, --format    Format files in source directory
   version, -v, --version  Print version
+  lsp, --lsp              LSP server mode (default)
 ```
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
@@ -72,16 +72,16 @@ Commands:
 Для запуска в режиме анализа используется параметр `--analyze` (сокращенно `-a`). 
 
 ```sh
-Usage:  analyze [-h] [--silent] [-c=<path>] [-o=<path>] [-s=<path>]
-                [-r=<keys>]...
+Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]
+                                   [-r=<keys>]...
 Run analysis and get diagnostic info
   -c, --configuration=<path>
                            Path to language server configuration file
   -h, --help               Show this help message and exit
   -o, --outputDir=<path>   Output report directory
-  -r, --reporter=<keys>    Reporter key (console, json, junit, tslint, generic)
+  -q, --silent             Silent mode
+  -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
-      --silent             Silent mode
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
@@ -106,11 +106,11 @@ java -Xmx4g -jar bsl-language-server.jar ...остальные параметр
 Для запуска в режиме форматтера используется параметр `--format` (сокращенно `-f`).
 
 ```sh
-Usage:  format [-h] [--silent] [-s=<path>]
+Usage: bsl-language-server format [-hq] [-s=<path>]
 Format files in source directory
   -h, --help            Show this help message and exit
+  -q, --silent          Silent mode
   -s, --srcDir=<path>   Source directory
-      --silent          Silent mode
 ```
 
 Для указания каталога расположения форматируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index c941a06572c..e552d0ead67 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -39,7 +39,6 @@
 
 @Command(
   name = "bsl-language-server",
-  description = "BSL language server",
   subcommands = {
     AnalyzeCommand.class,
     FormatCommand.class,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
index 0466ff5e196..a0bf35d2c24 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java
@@ -48,8 +48,8 @@
  *  без ключа
  * Параметры:
  * -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
- *                                   Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
- *                                   то будут использованы настройки по умолчанию.
+ *                                     Возможно указывать как в абсолютном, так и относительном виде.
+ *                                     Если параметр опущен, то будут использованы настройки по умолчанию.
  * Выводимая информация:
  *  Данный режим используется для взаимодействия с клиентом по протоколу LSP.
  */

From 7cb61c34a6ad021f878a9a453906e562f565ca39 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 23 Apr 2020 13:04:10 +0300
Subject: [PATCH 133/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20skipped-=D1=82=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Внутри кода System.exit, который надо превентить.
---
 .../github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index a6016064dff..35b785f7fba 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -217,6 +217,7 @@ void testWithoutParameters() {
   }
 
   @Test
+  @ExpectSystemExitWithStatus(0)
   void testWithoutParametersErrorCfg() {
     // given
     String[] args = new String[]{"-c", "src/test/resources/cli/error-trace.json"};

From 70208070877e533859d14f2a30c7aa57e7a20e6e Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Thu, 23 Apr 2020 17:33:24 +0300
Subject: [PATCH 134/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedAttributes8312Diagnostic.java   | 212 ++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
new file mode 100644
index 00000000000..c51482c8d4c
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
@@ -0,0 +1,212 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
+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.DiagnosticScope;
+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.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.HashMap;
+import java.util.StringJoiner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  scope = DiagnosticScope.BSL,
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_12,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.DEPRECATED
+  }
+
+)
+public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String CHART_PLOT_AREA_RU = "ОбластьПостроенияДиаграммы";
+  private static final String CHART_PLOT_AREA_EN = "ChartPlotArea";
+  // ChartPlotArea deprecated attributes
+  private static final String SHOW_SCALE_RU = "ОтображатьШкалу";
+  private static final String SHOW_SCALE_EN = "ShowScale";
+  private static final String SCALE_LINES_RU = "ЛинииШкалы";
+  private static final String SCALE_LINES_EN = "ScaleLines";
+  private static final String SCALE_COLOR_RU = "ЦветШкалы";
+  private static final String SCALE_COLOR_EN = "ScaleColor";
+  private static final String SHOW_SERIES_SCALE_LABELS_RU = "ОтображатьПодписиШкалыСерий";
+  private static final String SHOW_SERIES_SCALE_LABELS_EN = "ShowSeriesScaleLabels";
+  private static final String SHOW_POINTS_SCALE_LABELS_RU = "ОтображатьПодписиШкалыТочек";
+  private static final String SHOW_POINTS_SCALE_LABELS_EN = "ShowPointsScaleLabels";
+  private static final String SHOW_VALUES_SCALE_LABELS_RU = "ОтображатьПодписиШкалыЗначений";
+  private static final String SHOW_VALUES_SCALE_LABELS_EN = "ShowValuesScaleLabels";
+  private static final String SHOW_SCALE_VALUE_LINES_RU = "ОтображатьЛинииЗначенийШкалы";
+  private static final String SHOW_SCALE_VALUE_LINES_EN = "ShowScaleValueLines";
+  private static final String VALUE_SCALE_FORMAT_RU = "ФорматШкалыЗначений";
+  private static final String VALUE_SCALE_FORMAT_EN = "ValueScaleFormat";
+  private static final String LABELS_ORIENTATION_RU = "ОриентацияМеток";
+  private static final String LABELS_ORIENTATION_EN = "LabelsOrientation";
+
+  private static final String CHART_RU = "Диаграмма";
+  private static final String CHART_EN = "Chart";
+  private static final String GANTT_CHART_EN = "GanttChart";
+  private static final String GANTT_CHART_RU = "ДиаграммаГанта";
+  private static final String PIVOT_CHART_EN = "PivotChart";
+  private static final String PIVOT_CHART_RU = "СводнаяДиаграмма";
+  // General deprecated attributes
+  private static final String SHOW_LEGEND_EN = "ShowLegend";
+  private static final String SHOW_LEGEND_RU = "ОтображатьЛегенду";
+  private static final String SHOW_TITLE_EN = "ShowTitle";
+  private static final String SHOW_TITLE_RU = "ОтображатьЗаголовок";
+  // Chart deprecated attributes
+  private static final String COLOR_PALETTE_EN = "ColorPalette";
+  private static final String COLOR_PALETTE_RU = "ПалитраЦветов";
+  private static final String GRADIENT_PALETTE_START_COLOR_EN = "GradientPaletteStartColor";
+  private static final String GRADIENT_PALETTE_START_COLOR_RU = "ЦветНачалаГрадиентнойПалитры";
+  private static final String GRADIENT_PALETTE_END_COLOR_EN = "GradientPaletteEndColor";
+  private static final String GRADIENT_PALETTE_END_COLOR_RU = "ЦветКонцаГрадиентнойПалитры";
+  private static final String GRADIENT_PALETTE_MAX_COLORS_EN = "GradientPaletteMaxColors";
+  private static final String GRADIENT_PALETTE_MAX_COLORS_RU = "МаксимальноеКоличествоЦветовГрадиентнойПалитры";
+  // Chart deprecated methods
+  private static final String GET_PALETTE_EN = "GetPalette";
+  private static final String GET_PALETTE_RU = "ПалитраЦветов";
+  private static final String SET_PALETTE_EN = "SetPalette";
+  private static final String SET_PALETTE_RU = "УстановитьПалитру";
+
+
+  private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
+    HashMap<String, String> attributesPair = new HashMap<>();
+    if (metaobject.equals(Metaobject.CHART_PLOT_AREA)) {
+      attributesPair.put(SHOW_SCALE_RU, SHOW_SCALE_EN);
+      attributesPair.put(SCALE_LINES_RU, SCALE_LINES_EN);
+      attributesPair.put(SCALE_COLOR_RU, SCALE_COLOR_EN);
+      attributesPair.put(SHOW_SERIES_SCALE_LABELS_RU, SHOW_SERIES_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_POINTS_SCALE_LABELS_RU, SHOW_POINTS_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_VALUES_SCALE_LABELS_RU, SHOW_VALUES_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_SCALE_VALUE_LINES_RU, SHOW_SCALE_VALUE_LINES_EN);
+      attributesPair.put(VALUE_SCALE_FORMAT_RU, VALUE_SCALE_FORMAT_EN);
+      attributesPair.put(LABELS_ORIENTATION_RU, LABELS_ORIENTATION_EN);
+    } else if (metaobject.equals(Metaobject.CHART)) {
+      attributesPair.put(SHOW_LEGEND_EN, SHOW_LEGEND_RU);
+      attributesPair.put(SHOW_TITLE_EN, SHOW_TITLE_RU);
+      attributesPair.put(COLOR_PALETTE_EN, COLOR_PALETTE_RU);
+      attributesPair.put(GRADIENT_PALETTE_START_COLOR_EN, GRADIENT_PALETTE_START_COLOR_RU);
+      attributesPair.put(GRADIENT_PALETTE_END_COLOR_EN, GRADIENT_PALETTE_END_COLOR_RU);
+      attributesPair.put(GRADIENT_PALETTE_MAX_COLORS_EN, GRADIENT_PALETTE_MAX_COLORS_RU);
+    }
+    StringJoiner regex = new StringJoiner("|");
+
+    attributesPair.forEach((k, v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private static String getChartMethodsRegex() {
+    HashMap<String, String> attributesPair = new HashMap<>();
+
+    attributesPair.put(GET_PALETTE_EN, GET_PALETTE_RU);
+    attributesPair.put(SET_PALETTE_EN, SET_PALETTE_RU);
+
+    StringJoiner regex = new StringJoiner("|");
+
+    attributesPair.forEach((k, v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private static String getMetaobjectNameRegex(Metaobject metaobject) {
+    HashMap<String, String> namePair = new HashMap<>();
+    if (metaobject.equals(Metaobject.CHART_PLOT_AREA)) {
+      namePair.put(CHART_PLOT_AREA_RU, CHART_PLOT_AREA_EN);
+    } else if (metaobject.equals(Metaobject.CHART)) {
+      namePair.put(CHART_RU, CHART_EN);
+      namePair.put(GANTT_CHART_EN, GANTT_CHART_RU);
+      namePair.put(PIVOT_CHART_EN, PIVOT_CHART_RU);
+    }
+    StringJoiner regex = new StringJoiner("|");
+
+    namePair.forEach((k, v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private static final Pattern CHART_PLOT_AREA_ATTRIBUTES_PATTERN = Pattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.CHART_PLOT_AREA),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHART_ATTRIBUTES_PATTERN = Pattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.CHART),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHART_METHODS_PATTERN = Pattern.compile(
+    getChartMethodsRegex(),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHART_PLOT_AREA_NAME_PATTERN = Pattern.compile(
+    getMetaobjectNameRegex(Metaobject.CHART_PLOT_AREA),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHART_NAME_PATTERN = Pattern.compile(
+    getMetaobjectNameRegex(Metaobject.CHART),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+
+  public DeprecatedAttributes8312Diagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitAccessProperty(BSLParser.AccessPropertyContext ctx) {
+
+    if (isDeprecated(ctx, CHART_PLOT_AREA_NAME_PATTERN, CHART_PLOT_AREA_ATTRIBUTES_PATTERN)
+    || isDeprecated(ctx, CHART_NAME_PATTERN, CHART_ATTRIBUTES_PATTERN)) {
+      diagnosticStorage.addDiagnostic(ctx);
+    }
+
+    return super.visitAccessProperty(ctx);
+  }
+
+  private boolean isDeprecated(BSLParser.AccessPropertyContext ctx,
+                               Pattern objectNamePattern,
+                               Pattern deprecatedAttributesPattern) {
+
+    Matcher matcherChartPlotArea = deprecatedAttributesPattern.matcher(ctx.getText().substring(1));
+
+    if (matcherChartPlotArea.matches()) {
+      var complexCtx = Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_complexIdentifier);
+      if (complexCtx == null) {
+        complexCtx = Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_lValue);
+        if (complexCtx == null) {
+          return false;
+        }
+      }
+
+      Matcher matcherChartPlotAreaName = objectNamePattern.matcher(
+        complexCtx.getStart().getText()
+      );
+      return matcherChartPlotAreaName.matches();
+    }
+
+    return false;
+  }
+
+  private enum Metaobject{
+    CHART,
+    CHART_PLOT_AREA
+  }
+}
+
+

From 502066cde005c8f80ec9410ece5e4e63a25d98f3 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Thu, 23 Apr 2020 20:55:08 +0300
Subject: [PATCH 135/444] =?UTF-8?q?=D0=A7=D0=B5=D1=80=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedAttributes8312.md  |  36 +++++
 docs/diagnostics/index.md                     |   5 +-
 .../diagnostics/DeprecatedAttributes8312.md   |  36 +++++
 docs/en/diagnostics/index.md                  |   5 +-
 .../DeprecatedAttributes8312Diagnostic.java   | 148 +++++++++++++++---
 .../configuration/parameters-schema.json      |  10 ++
 .../languageserver/configuration/schema.json  |   3 +
 ...atedAttributes8312Diagnostic_en.properties |   3 +
 ...atedAttributes8312Diagnostic_ru.properties |   3 +
 ...eprecatedAttributes8312DiagnosticTest.java |  46 ++++++
 .../DeprecatedAttributes8312Diagnostic.bsl    |  80 ++++++++++
 11 files changed, 346 insertions(+), 29 deletions(-)
 create mode 100644 docs/diagnostics/DeprecatedAttributes8312.md
 create mode 100644 docs/en/diagnostics/DeprecatedAttributes8312.md
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl

diff --git a/docs/diagnostics/DeprecatedAttributes8312.md b/docs/diagnostics/DeprecatedAttributes8312.md
new file mode 100644
index 00000000000..252b10a1d49
--- /dev/null
+++ b/docs/diagnostics/DeprecatedAttributes8312.md
@@ -0,0 +1,36 @@
+# Устаревшее использование объектов (DeprecatedAttributes8312)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Информационный` | `Да` | `1` | `deprecated` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:DeprecatedAttributes8312-off
+// BSLLS:DeprecatedAttributes8312-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"DeprecatedAttributes8312": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index eac9427cc9b..c29cd957733 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **93**
+Общее количество: **94**
 
-* Дефект кода: **58**
+* Дефект кода: **59**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
@@ -32,6 +32,7 @@
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
+| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Устаревшее использование объектов | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
new file mode 100644
index 00000000000..055a3f60cc5
--- /dev/null
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (DeprecatedAttributes8312)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:DeprecatedAttributes8312-off
+// BSLLS:DeprecatedAttributes8312-on
+```
+
+### Parameter for config
+
+```json
+"DeprecatedAttributes8312": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 40af697dbe0..7eb695f67f9 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **93**
+Total: **94**
 
 * Error: **31**
-* Code smell: **58**
+* Code smell: **59**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -32,6 +32,7 @@ Total: **93**
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
+| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | <Diagnostic name> | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
index c51482c8d4c..59d1653da67 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
@@ -9,9 +30,11 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
+import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,9 +58,9 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String SHOW_SCALE_RU = "ОтображатьШкалу";
   private static final String SHOW_SCALE_EN = "ShowScale";
   private static final String SCALE_LINES_RU = "ЛинииШкалы";
-  private static final String SCALE_LINES_EN = "ScaleLines";
+  //private static final String SCALE_LINES_EN = "ScaleLines";
   private static final String SCALE_COLOR_RU = "ЦветШкалы";
-  private static final String SCALE_COLOR_EN = "ScaleColor";
+  //private static final String SCALE_COLOR_EN = "ScaleColor";
   private static final String SHOW_SERIES_SCALE_LABELS_RU = "ОтображатьПодписиШкалыСерий";
   private static final String SHOW_SERIES_SCALE_LABELS_EN = "ShowSeriesScaleLabels";
   private static final String SHOW_POINTS_SCALE_LABELS_RU = "ОтображатьПодписиШкалыТочек";
@@ -73,17 +96,38 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String GRADIENT_PALETTE_MAX_COLORS_RU = "МаксимальноеКоличествоЦветовГрадиентнойПалитры";
   // Chart deprecated methods
   private static final String GET_PALETTE_EN = "GetPalette";
-  private static final String GET_PALETTE_RU = "ПалитраЦветов";
+  private static final String GET_PALETTE_RU = "ПолучитьПалитру";
   private static final String SET_PALETTE_EN = "SetPalette";
   private static final String SET_PALETTE_RU = "УстановитьПалитру";
 
+  // Global context enum
+  private static final String CHART_LABELS_ORIENTATION_EN = "ChartLabelsOrientation";
+  private static final String CHART_LABELS_ORIENTATION_RU = "ОриентацияМетокДиаграммы";
+
+  // Global context enum attribute
+  private static final String CHILD_FORM_ITEMS_GROUP_EN = "ChildFormItemsGroup";
+  private static final String CHILD_FORM_ITEMS_GROUP_RU = "ГруппировкаПодчиненныхЭлементовФормы";
+  private static final String CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN = "Horizontal";
+  private static final String CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU = "Горизонтальная";
+
+  // Global context methods
+  private static final String CLEAR_EVENT_LOG_EN = "ClearEventLog";
+  private static final String CLEAR_EVENT_LOG_RU = "ОчиститьЖурналРегистрации";
+
+  private static final HashMap<String, String> NEW_ATTRIBUTES = new HashMap<>();
+  static {
+    NEW_ATTRIBUTES.put(SHOW_SCALE_RU, "ОтображатьШкалы");
+    NEW_ATTRIBUTES.put(SHOW_SCALE_EN, "ShowScales");
+    NEW_ATTRIBUTES.put(SCALE_LINES_RU, "ЛинииШкал");
+    NEW_ATTRIBUTES.put(SCALE_COLOR_RU, "ЦветШкал");
+  }
 
   private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
     HashMap<String, String> attributesPair = new HashMap<>();
     if (metaobject.equals(Metaobject.CHART_PLOT_AREA)) {
       attributesPair.put(SHOW_SCALE_RU, SHOW_SCALE_EN);
-      attributesPair.put(SCALE_LINES_RU, SCALE_LINES_EN);
-      attributesPair.put(SCALE_COLOR_RU, SCALE_COLOR_EN);
+      attributesPair.put(SCALE_LINES_RU, "");
+      attributesPair.put(SCALE_COLOR_RU, "");
       attributesPair.put(SHOW_SERIES_SCALE_LABELS_RU, SHOW_SERIES_SCALE_LABELS_EN);
       attributesPair.put(SHOW_POINTS_SCALE_LABELS_RU, SHOW_POINTS_SCALE_LABELS_EN);
       attributesPair.put(SHOW_VALUES_SCALE_LABELS_RU, SHOW_VALUES_SCALE_LABELS_EN);
@@ -97,6 +141,8 @@ private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
       attributesPair.put(GRADIENT_PALETTE_START_COLOR_EN, GRADIENT_PALETTE_START_COLOR_RU);
       attributesPair.put(GRADIENT_PALETTE_END_COLOR_EN, GRADIENT_PALETTE_END_COLOR_RU);
       attributesPair.put(GRADIENT_PALETTE_MAX_COLORS_EN, GRADIENT_PALETTE_MAX_COLORS_RU);
+    } else if (metaobject.equals(Metaobject.ENUM_ITEMS_GROUP)) {
+      attributesPair.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN, CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU);
     }
     StringJoiner regex = new StringJoiner("|");
 
@@ -108,11 +154,13 @@ private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
     return regex.toString();
   }
 
-  private static String getChartMethodsRegex() {
+  private static String getDeprecatedMethodsRegex(Metaobject metaobject) {
     HashMap<String, String> attributesPair = new HashMap<>();
 
-    attributesPair.put(GET_PALETTE_EN, GET_PALETTE_RU);
-    attributesPair.put(SET_PALETTE_EN, SET_PALETTE_RU);
+    if (metaobject.equals(Metaobject.CHART)) {
+      attributesPair.put(GET_PALETTE_EN, GET_PALETTE_RU);
+      attributesPair.put(SET_PALETTE_EN, SET_PALETTE_RU);
+    }
 
     StringJoiner regex = new StringJoiner("|");
 
@@ -132,6 +180,8 @@ private static String getMetaobjectNameRegex(Metaobject metaobject) {
       namePair.put(CHART_RU, CHART_EN);
       namePair.put(GANTT_CHART_EN, GANTT_CHART_RU);
       namePair.put(PIVOT_CHART_EN, PIVOT_CHART_RU);
+    } else if (metaobject.equals(Metaobject.ENUM_ITEMS_GROUP)) {
+      namePair.put(CHILD_FORM_ITEMS_GROUP_EN, CHILD_FORM_ITEMS_GROUP_RU);
     }
     StringJoiner regex = new StringJoiner("|");
 
@@ -152,7 +202,7 @@ private static String getMetaobjectNameRegex(Metaobject metaobject) {
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final Pattern CHART_METHODS_PATTERN = Pattern.compile(
-    getChartMethodsRegex(),
+    getDeprecatedMethodsRegex(Metaobject.CHART),
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final Pattern CHART_PLOT_AREA_NAME_PATTERN = Pattern.compile(
@@ -163,49 +213,97 @@ private static String getMetaobjectNameRegex(Metaobject metaobject) {
     getMetaobjectNameRegex(Metaobject.CHART),
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
+  private static final Pattern CHART_LABELS_ORIENTATION_PATTERN = Pattern.compile(
+    CHART_LABELS_ORIENTATION_EN + "|" + CHART_LABELS_ORIENTATION_RU,
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHILD_FORM_ITEMS_GROUP_NAME_PATTERN = Pattern.compile(
+    getMetaobjectNameRegex(Metaobject.ENUM_ITEMS_GROUP),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CHILD_FORM_ITEMS_GROUP_ATTRIBUTE_PATTERN = Pattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.ENUM_ITEMS_GROUP),
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
+  private static final Pattern CLEAR_EVENT_LOG_PATTERN = Pattern.compile(
+    CLEAR_EVENT_LOG_EN + "|" + CLEAR_EVENT_LOG_RU,
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+
 
   public DeprecatedAttributes8312Diagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
-  public ParseTree visitAccessProperty(BSLParser.AccessPropertyContext ctx) {
+  public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
+
+    if (CHART_METHODS_PATTERN.matcher(ctx.methodName().getText()).matches()) {
+      diagnosticStorage.addDiagnostic(ctx);
+    }
+
+    return super.visitMethodCall(ctx);
+  }
 
-    if (isDeprecated(ctx, CHART_PLOT_AREA_NAME_PATTERN, CHART_PLOT_AREA_ATTRIBUTES_PATTERN)
-    || isDeprecated(ctx, CHART_NAME_PATTERN, CHART_ATTRIBUTES_PATTERN)) {
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    if (CLEAR_EVENT_LOG_PATTERN.matcher(ctx.methodName().getText()).matches()) {
       diagnosticStorage.addDiagnostic(ctx);
     }
+    return super.visitGlobalMethodCall(ctx);
+  }
+
+  @Override
+  public ParseTree visitAccessProperty(BSLParser.AccessPropertyContext ctx) {
+
+    HashMap<Pattern, Pattern> patternsToCheck = new HashMap<>();
+    patternsToCheck.put(CHART_PLOT_AREA_NAME_PATTERN, CHART_PLOT_AREA_ATTRIBUTES_PATTERN);
+    patternsToCheck.put(CHART_NAME_PATTERN, CHART_ATTRIBUTES_PATTERN);
+    patternsToCheck.put(CHILD_FORM_ITEMS_GROUP_NAME_PATTERN, CHILD_FORM_ITEMS_GROUP_ATTRIBUTE_PATTERN);
+
+    patternsToCheck.forEach((k, v) -> checkDeprecatedAttributes(ctx, k, v));
 
     return super.visitAccessProperty(ctx);
   }
 
-  private boolean isDeprecated(BSLParser.AccessPropertyContext ctx,
-                               Pattern objectNamePattern,
-                               Pattern deprecatedAttributesPattern) {
+  @Override
+  public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx) {
+    if (CHART_LABELS_ORIENTATION_PATTERN.matcher(ctx.getStart().getText()).matches()) {
+      diagnosticStorage.addDiagnostic(ctx);
+    }
+
+    return super.visitComplexIdentifier(ctx);
+  }
+
+  private void checkDeprecatedAttributes(BSLParserRuleContext ctx,
+                                            Pattern objectNamePattern,
+                                            Pattern deprecatedAttributesPattern) {
 
-    Matcher matcherChartPlotArea = deprecatedAttributesPattern.matcher(ctx.getText().substring(1));
+    Matcher deprecatedAttributesMatcher = deprecatedAttributesPattern.matcher(ctx.getText().substring(1));
 
-    if (matcherChartPlotArea.matches()) {
+    if (deprecatedAttributesMatcher.matches()) {
       var complexCtx = Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_complexIdentifier);
       if (complexCtx == null) {
         complexCtx = Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_lValue);
         if (complexCtx == null) {
-          return false;
+          return;
         }
       }
+      if (objectNamePattern.matcher(complexCtx.getStart().getText()).matches()) {
+        String deprecatedAttribute = deprecatedAttributesMatcher.group();
+        String message = String.format(info.getResourceString("deprecatedAttributeMessage"),
+          deprecatedAttribute,
+          Objects.requireNonNullElseGet(NEW_ATTRIBUTES.get(deprecatedAttribute), String::new));
 
-      Matcher matcherChartPlotAreaName = objectNamePattern.matcher(
-        complexCtx.getStart().getText()
-      );
-      return matcherChartPlotAreaName.matches();
-    }
+        diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
+      }
 
-    return false;
+    }
   }
 
   private enum Metaobject{
     CHART,
-    CHART_PLOT_AREA
+    CHART_PLOT_AREA,
+    ENUM_ITEMS_GROUP
   }
 }
 
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 aab363c6a53..8f2d0d04bbe 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
@@ -206,6 +206,16 @@
             "title": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
             "$id": "#/definitions/DeletingCollectionItem"
         },
+        "DeprecatedAttributes8312": {
+            "description": "<Diagnostic name>",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "<Diagnostic name>",
+            "$id": "#/definitions/DeprecatedAttributes8312"
+        },
         "DeprecatedCurrentDate": {
             "description": "Using of the deprecated method \"CurrentDate\"",
             "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 e4e5668caff..20141ed863e 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
@@ -68,6 +68,9 @@
                 "DeletingCollectionItem": {
                     "$ref": "parameters-schema.json#/definitions/DeletingCollectionItem"
                 },
+                "DeprecatedAttributes8312": {
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedAttributes8312"
+                },
                 "DeprecatedCurrentDate": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedCurrentDate"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
new file mode 100644
index 00000000000..f56bffb6cd7
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
@@ -0,0 +1,3 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
+deprecatedAttributeMessage=\"%s\" attribute is deprecated. You should use \"%s\"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
new file mode 100644
index 00000000000..f20e7315b97
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
@@ -0,0 +1,3 @@
+diagnosticMessage=%s
+diagnosticName=Устаревшее использование объектов
+deprecatedAttributeMessage=Атрибут \"%s\" устарел. Вместо него стоит использовать \"%s\"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
new file mode 100644
index 00000000000..19d2c26bf87
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
@@ -0,0 +1,46 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class DeprecatedAttributes8312DiagnosticTest extends AbstractDiagnosticTest<DeprecatedAttributes8312Diagnostic> {
+  DeprecatedAttributes8312DiagnosticTest() {
+    super(DeprecatedAttributes8312Diagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(46);
+//    assertThat(diagnostics, true)
+//      .hasRange(6, 0, 6, 20);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl
new file mode 100644
index 00000000000..1916e3b2c8c
--- /dev/null
+++ b/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl
@@ -0,0 +1,80 @@
+Процедура Тест()
+    тест = ОбластьПостроенияДиаграммы.ОтображатьШкалу;
+    ОбластьПостроенияДиаграммы.ЛинииШкалы = Ложь;
+    ОбластьПостроенияДиаграммы.ЦветШкалы = Ложь;
+    ОбластьПостроенияДиаграммы.ОтображатьПодписиШкалыСерий = Ложь;
+    ОбластьПостроенияДиаграммы.ОтображатьПодписиШкалыТочек = Ложь;
+    ОбластьПостроенияДиаграммы.ОтображатьПодписиШкалыЗначений = Ложь;
+    ОбластьПостроенияДиаграммы.ОтображатьЛинииЗначенийШкалы = Ложь;
+    ОбластьПостроенияДиаграммы.ФорматШкалыЗначений = Ложь;
+    ОбластьПостроенияДиаграммы.ОриентацияМеток = Ложь;
+КонецПроцедуры
+
+Procedure Test()
+    ChartPlotArea.ShowScale = True;
+    ChartPlotArea.ShowSeriesScaleLabels = True;
+    ChartPlotArea.ShowPointsScaleLabels = True;
+    ChartPlotArea.ShowValuesScaleLabels = True;
+    ChartPlotArea.ShowScaleValueLines = True;
+    ChartPlotArea.ValueScaleFormat = True;
+    ChartPlotArea.LabelsOrientation = True;
+EndProcedure
+
+Процедура Тест2()
+    Диаграмма.ОтображатьЛегенду = Истина;
+    Диаграмма.ОтображатьЗаголовок = Истина;
+    ДиаграммаГанта.ОтображатьЛегенду = Истина;
+    ДиаграммаГанта.ОтображатьЗаголовок = Истина;
+    СводнаяДиаграмма.ОтображатьЛегенду = Истина;
+    СводнаяДиаграмма.ОтображатьЗаголовок = Истина;
+
+    Диаграмма.ПалитраЦветов = Истина;
+    Диаграмма.ЦветНачалаГрадиентнойПалитры = Истина;
+    Диаграмма.ЦветКонцаГрадиентнойПалитры = Истина;
+    Диаграмма.МаксимальноеКоличествоЦветовГрадиентнойПалитры = Истина;
+
+    Тест = Диаграмма.ПолучитьПалитру();
+    Диаграмма.УстановитьПалитру(Неопределено);
+КонецПроцедуры
+
+Procedure Test2()
+    Chart.ShowLegend = True;
+    GanttChart.ShowLegend = True;
+    PivotChart.ShowLegend = True;
+    Chart.ShowTitle = True;
+    GanttChart.ShowTitle = True;
+    PivotChart.ShowTitle = True;
+
+    Chart.ColorPalette = True;
+    Chart.GradientPaletteStartColor = True;
+    Chart.GradientPaletteEndColor = True;
+    Chart.GradientPaletteMaxColors = True;
+
+    Chart.GetPalette();
+    Chart.SetPalette(True);
+
+EndProcedure
+
+Процедура Тест3()
+    Ориентация = ОриентацияМетокДиаграммы.Авто;
+КонецПроцедуры
+
+Procedure Test3()
+    test = ChartLabelsOrientation.Auto;
+EndProcedure
+
+Процедура Тест4()
+    ОчиститьЖурналРегистрации(Отбор);
+КонецПроцедуры
+
+Procedure Test4()
+    ClearEventLog(Filter);
+EndProcedure
+
+Процедура Тест5()
+    Группировка = ГруппировкаПодчиненныхЭлементовФормы.Горизонтальная;
+КонецПроцедуры
+
+Procedure Test5()
+    test = ChildFormItemsGroup.Horizontal;
+EndProcedure

From 67e567f496821906e2238019961ed6222cc65a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Thu, 23 Apr 2020 21:30:04 +0300
Subject: [PATCH 136/444] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BE=D0=B1=D1=80=D0=B0=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=20=D1=82=D0=BE=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExcessiveAutoTestCheckDiagnostic.java     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
index 6f62abf9e05..482dd9a9798 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -28,8 +28,10 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
@@ -74,13 +76,15 @@ private boolean expressionMatchesPattern(BSLParser.ExpressionContext expression)
   }
 
   private boolean codeBlockWithOnlyReturn(BSLParser.CodeBlockContext codeBlock) {
-    return codeBlock
-      .getTokens()
-      .stream()
-      .map(t -> t.getType())
-      .filter(t -> t != BSLParser.WHITE_SPACE)
-      .filter(t -> t != BSLParser.LINE_COMMENT)
-      .filter(t -> t != BSLParser.SEMICOLON)
-      .noneMatch(t -> t != BSLParser.RETURN_KEYWORD);
+    List<Token> tokens = codeBlock.getTokens();
+
+    if (tokens.size() == 2) {
+      return tokens.get(0).getType() == BSLParser.RETURN_KEYWORD
+        && tokens.get(1).getType() == BSLParser.SEMICOLON;
+    } else if (tokens.size() == 1) {
+      return tokens.get(0).getType() == BSLParser.RETURN_KEYWORD;
+    }
+
+    return false;
   }
 }

From cf06f3ba97f33c794d950f3e7ce606cb9ca53960 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 24 Apr 2020 08:57:02 +0300
Subject: [PATCH 137/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLSPLauncher.java    |  7 ++++++-
 .../languageserver/BSLLSPLauncherTest.java    | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
index e552d0ead67..003959134eb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncher.java
@@ -78,7 +78,12 @@ public static void main(String[] args) {
       // выполнение проверки строки запуска в попытке, т.к. парсер при нахождении
       // неизвестных параметров выдает ошибку
       try {
-        cmd.parseArgs(args);
+        var parseResult = cmd.parseArgs(args);
+        // если переданы параметры без команды и это не справка
+        // то считаем, что параметры для команды по умолчанию
+        if(!parseResult.hasSubcommand() && !parseResult.isUsageHelpRequested()) {
+          args = addDefaultCommand(args);
+        }
       } catch (ParameterException ex) {
         // если поймали ошибку, а имя команды не передано, подставим команду и посмотрим,
         // вдруг заработает
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 35b785f7fba..0c894344c74 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -216,6 +216,25 @@ void testWithoutParameters() {
     assertThat(errContent.toString()).isEmpty();
   }
 
+  @Test
+  void testWithoutCommandWithConfig() {
+    // проверим, что перешли в команду lsp
+
+    // given
+    String[] args = "-c .".split(" ");
+
+    // when
+    try {
+      BSLLSPLauncher.main(args);
+    } catch (RuntimeException ignored) {
+      // catch prevented system.exit call
+    }
+
+    // then
+    assertThat(outContent.toString()).isEmpty();
+    assertThat(errContent.toString()).contains("LanguageServerStartCommand");
+  }
+
   @Test
   @ExpectSystemExitWithStatus(0)
   void testWithoutParametersErrorCfg() {

From 70663a2a285fc839d64a7916dc5016d8cc232c49 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 24 Apr 2020 09:04:42 +0300
Subject: [PATCH 138/444] fix test

---
 .../github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
index 0c894344c74..8016980e416 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/BSLLSPLauncherTest.java
@@ -236,7 +236,6 @@ void testWithoutCommandWithConfig() {
   }
 
   @Test
-  @ExpectSystemExitWithStatus(0)
   void testWithoutParametersErrorCfg() {
     // given
     String[] args = new String[]{"-c", "src/test/resources/cli/error-trace.json"};

From f9ab293d7240c52a7dada2c818203b7f9c54452f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=AD=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4?= <skikaha@yandex.ru>
Date: Fri, 24 Apr 2020 13:21:40 +0300
Subject: [PATCH 139/444] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20getTok?=
 =?UTF-8?q?ens=20=D0=B2=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExcessiveAutoTestCheckDiagnostic.java           | 13 +++++++------
 .../ExcessiveAutoTestCheckDiagnostic.bsl            |  8 +++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
index 482dd9a9798..6adea7f6093 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -76,13 +76,14 @@ private boolean expressionMatchesPattern(BSLParser.ExpressionContext expression)
   }
 
   private boolean codeBlockWithOnlyReturn(BSLParser.CodeBlockContext codeBlock) {
-    List<Token> tokens = codeBlock.getTokens();
+    List<? extends BSLParser.StatementContext> statements = codeBlock.statement();
 
-    if (tokens.size() == 2) {
-      return tokens.get(0).getType() == BSLParser.RETURN_KEYWORD
-        && tokens.get(1).getType() == BSLParser.SEMICOLON;
-    } else if (tokens.size() == 1) {
-      return tokens.get(0).getType() == BSLParser.RETURN_KEYWORD;
+    if (statements.size() == 1) {
+      BSLParser.CompoundStatementContext compoundStatement = statements.get(0).compoundStatement();
+
+      if (compoundStatement != null) {
+        return compoundStatement.returnStatement() != null;
+      }
     }
 
     return false;
diff --git a/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl b/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl
index 3dc0a5f7e61..ccf824e2e73 100644
--- a/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl
+++ b/src/test/resources/diagnostics/ExcessiveAutoTestCheckDiagnostic.bsl
@@ -83,4 +83,10 @@ EndProcedure
 
     Возврат;
 
-КонецЕсли;
\ No newline at end of file
+КонецЕсли;
+
+If List.Property("AutoTest") Then // No error
+
+    List.Delete("AutoTest");
+
+EndIf;
\ No newline at end of file

From ccd796514ec427b4e92bf6b3f5d7625119dd2e25 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 24 Apr 2020 17:02:44 +0300
Subject: [PATCH 140/444] Update Typo.md

---
 docs/diagnostics/Typo.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/diagnostics/Typo.md b/docs/diagnostics/Typo.md
index 95cf7f7ec95..3f608c944b8 100644
--- a/docs/diagnostics/Typo.md
+++ b/docs/diagnostics/Typo.md
@@ -19,11 +19,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Полезная информация: [Русский язык для всех](http://gramota.ru/)
 * [Источник](https://languagetool.org/ru/)
 

From a03b96328bbc925700c00f138cf0581974341311 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 24 Apr 2020 17:05:00 +0300
Subject: [PATCH 141/444] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20Typo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/Typo.md                                      | 2 +-
 docs/en/diagnostics/Typo.md                                   | 2 +-
 .../bsl/languageserver/configuration/parameters-schema.json   | 4 ++--
 .../languageserver/diagnostics/TypoDiagnostic_en.properties   | 2 +-
 .../languageserver/diagnostics/TypoDiagnostic_ru.properties   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/diagnostics/Typo.md b/docs/diagnostics/Typo.md
index 3f608c944b8..95599089dc3 100644
--- a/docs/diagnostics/Typo.md
+++ b/docs/diagnostics/Typo.md
@@ -8,7 +8,7 @@
 
 | Имя | Тип | Описание | Значение по умолчанию |
 | :-: | :-: | :-- | :-: |
-| `userWordsToIgnore` | `Строка` | ```Пользовательский словарь исключений``` | `````` |
+| `userWordsToIgnore` | `Строка` | ```Пользовательский словарь исключений (через запятую, без пробелов)``` | `````` |
 | `minWordLength` | `Целое` | ```Минимальная длина проверяемых слов``` | ```3``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/Typo.md b/docs/en/diagnostics/Typo.md
index 869dae1b61a..8c2289de6e5 100644
--- a/docs/en/diagnostics/Typo.md
+++ b/docs/en/diagnostics/Typo.md
@@ -8,7 +8,7 @@
 
 | Name | Type | Description | Default value |
 | :-: | :-: | :-- | :-: |
-| `userWordsToIgnore` | `String` | ```Dictionary for excluding words``` | `````` |
+| `userWordsToIgnore` | `String` | ```Dictionary for excluding words (comma separated, without spaces)``` | `````` |
 | `minWordLength` | `Integer` | ```Minimum length for checked words``` | ```3``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
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 aab363c6a53..5ade19e04ce 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
@@ -960,10 +960,10 @@
             "title": "Typo",
             "properties": {
                 "userWordsToIgnore": {
-                    "description": "Dictionary for excluding words",
+                    "description": "Dictionary for excluding words (comma separated, without spaces)",
                     "default": "",
                     "type": "string",
-                    "title": "Dictionary for excluding words"
+                    "title": "Dictionary for excluding words (comma separated, without spaces)"
                 },
                 "minWordLength": {
                     "description": "Minimum length for checked words",
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_en.properties
index ba5aade700f..7c72bc94c95 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_en.properties
@@ -7,4 +7,4 @@ diagnosticExceptions=Str,Autotest,Infobase,Enums,Len,Desc,Asc,Overridable,GUID,E
   Sys,Saas,www,yyyy,xsl,src,deserialization,Params,Archiver,Serializer,xsi,ico,epf,cfu,txt,htm,rtf,ppt,vsd,mpp,mdb,msg,rar,exe,grs,geo,jpg,bmp,\
   tif,gif,png,pdf,odt,odf,odp,odg,ods,erf,docx,xlsx,pptx,utf,xsd,SRVR,saas,wsdl,Apdex,APDEX,uid,XLS,XLSX,html,TXT,ODT,Addin,DIB
 minWordLength=Minimum length for checked words
-userWordsToIgnore=Dictionary for excluding words
\ No newline at end of file
+userWordsToIgnore=Dictionary for excluding words (comma separated, without spaces)
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
index 8643041577d..53e9da049f3 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic_ru.properties
@@ -14,4 +14,4 @@ diagnosticExceptions=Автогенерируемых,Автогруппиров
   ,Сериализованный,Сис,Сконвертировать,Слеш,Слеша,Слеши,Стартован,Стикера,Стр,Студотряде,Субконто,Таб,Техподдержки\
   ,Токене,Транслите,Тэги,Тэгов,Убыв,Физлица,Финализировать,Фич,Хэш,Штрихкодам,Штрихкодом,Штрихкоду,Мдд,Чммсс
 minWordLength=Минимальная длина проверяемых слов
-userWordsToIgnore=Пользовательский словарь исключений
\ No newline at end of file
+userWordsToIgnore=Пользовательский словарь исключений (через запятую, без пробелов)
\ No newline at end of file

From 36e015d9d6ead85cfb6883dd898e033bdfa70877 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 24 Apr 2020 17:08:18 +0300
Subject: [PATCH 142/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/Typo.md    | 17 -----------------
 docs/en/diagnostics/Typo.md | 20 --------------------
 2 files changed, 37 deletions(-)

diff --git a/docs/diagnostics/Typo.md b/docs/diagnostics/Typo.md
index 95599089dc3..22c07c37d0d 100644
--- a/docs/diagnostics/Typo.md
+++ b/docs/diagnostics/Typo.md
@@ -23,23 +23,6 @@
 * Полезная информация: [Русский язык для всех](http://gramota.ru/)
 * [Источник](https://languagetool.org/ru/)
 
-<!-- Блоки ниже заполняются автоматически, не трогать -->
-### Экранирование кода
-
-```bsl
-// BSLLS:Typo-off
-// BSLLS:Typo-on
-```
-
-### Параметр конфигурационного файла
-
-```json
-"Typo": {
-    "userWordsToIgnore": "",
-    "minWordLength": 3
-}
-```
-
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/Typo.md b/docs/en/diagnostics/Typo.md
index 8c2289de6e5..4b090808a73 100644
--- a/docs/en/diagnostics/Typo.md
+++ b/docs/en/diagnostics/Typo.md
@@ -19,29 +19,9 @@ and checked in the built-in dictionary.
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * [American English Dictionary](https://dictionary.cambridge.org/dictionary/essential-american-english/)
 * [Source](https://languagetool.org/en/)
-<!-- Блоки ниже заполняются автоматически, не трогать -->
-### Diagnostic ignorance in code
-
-```bsl
-// BSLLS:Typo-off
-// BSLLS:Typo-on
-```
-
-### Parameter for config
-
-```json
-"Typo": {
-    "userWordsToIgnore": "",
-    "minWordLength": 3
-}
-```
 
 ## Snippets
 

From ea3ea08a9d875c9f2a19f4558ad5080e97b76068 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Sat, 25 Apr 2020 13:40:59 +0300
Subject: [PATCH 143/444] =?UTF-8?q?Precommit.=20=D0=9D=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B8=D1=85=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=208.3?=
 =?UTF-8?q?.12.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B2=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B5=208.3.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedAttributes8312.md  |  38 +++++-
 docs/diagnostics/index.md                     |   2 +-
 .../diagnostics/DeprecatedAttributes8312.md   |   2 +-
 docs/en/diagnostics/index.md                  |   2 +-
 .../DeprecatedAttributes8312Diagnostic.java   | 112 +++++++++++++++---
 .../DeprecatedMethods8310Diagnostic.java      |  38 ++++--
 .../configuration/parameters-schema.json      |   4 +-
 ...atedAttributes8312Diagnostic_en.properties |   9 +-
 ...atedAttributes8312Diagnostic_ru.properties |   7 +-
 ...eprecatedAttributes8312DiagnosticTest.java |  50 +++++++-
 .../DeprecatedAttributes8312Diagnostic.bsl    |   4 -
 11 files changed, 217 insertions(+), 51 deletions(-)

diff --git a/docs/diagnostics/DeprecatedAttributes8312.md b/docs/diagnostics/DeprecatedAttributes8312.md
index 252b10a1d49..da880d16fc3 100644
--- a/docs/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/diagnostics/DeprecatedAttributes8312.md
@@ -1,4 +1,4 @@
-# Устаревшее использование объектов (DeprecatedAttributes8312)
+# Устаревшие объекты платформы 8.3.12 (DeprecatedAttributes8312)
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
@@ -7,10 +7,37 @@
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-
-## Примеры
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
-
+В платформе 8.3.12 следующие элементы стали устаревшими:
+* Для системного перечисления ГруппировкаПодчиненныхЭлементовФормы реализовано значение ГоризонтальнаяВсегда.
+Значение системного перечисления ГруппировкаПодчиненныхЭлементовФормы.Горизонтальная считается устаревшим;
+* Системное перечисление ОриентацияМетокДиаграммы более не доступно. Актуальный вариант ОриентацияПодписейДиаграммы;
+* Свойства и методы объекта Диаграмма устарели и не рекомендуются к использованию: 
+   * ПалитраЦветов;
+   * ЦветНачалаГрадиентнойПалитры;
+   * ЦветКонцаГрадиентнойПалитры; 
+   * МаксимальноеКоличествоЦветовГрадиентнойПалитры; 
+   * ПолучитьПалитру();
+   * УстановитьПалитру().
+* Названия свойств объекта ОбластьПостроенияДиаграммы:
+   * ОтображатьШкалу;
+   * ЛинииШкалы;
+   * ЦветШкалы.
+* Свойства объекта ОбластьПостроенияДиаграммы являются устаревшими, 
+не рекомендуются для использования и поддерживаются для совместимости:
+  
+   * ОтображатьПодписиШкалыСерии. Для доступа рекомендуется использовать ШкалаСерий.ПоложениеПодписейШкалы;
+   * ОтображатьПодписиШкалыТочек. Для доступа рекомендуется использовать ШкалаТочек.ПоложениеПодписейШкалы;
+   * ОтображатьПодписиШкалыЗначений. Для доступа рекомендуется использовать ШкалаЗначений.ПоложениеПодписейШкалы;
+   * ОтображатьЛинииЗначенийШкалы. Для доступа рекомендуется использовать ШкалаЗначений.ОтображениеЛинийСетки;
+   * ФорматШкалыЗначений. Для доступа рекомендуется использовать ШкалаЗначений.ФорматПодписей;
+   * ОриентацияМеток. Для доступа рекомендуется использовать ШкалаТочек.ОриентацияПодписей.
+* Свойство ОтображатьЛегенду объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим 
+и не рекомендуется для использования.
+* Свойство ОтображатьЗаголовок объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим и
+ не рекомендуется для использования.
+* Метод глобального контекста ОчиститьЖурналРегистрации() 
+применим только к журналу в формата SQLite, признан устаревшим и его использование не рекомендуется.
+  
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -18,6 +45,7 @@
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+Источник: [Описание изменений платформы 8.3.12](https://dl04.1c.ru/content/Platform/8_3_12_1714/1cv8upd_8_3_12_1714.htm)
 
 ## Сниппеты
 
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index c29cd957733..784ac601b59 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -32,7 +32,7 @@
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
-| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Устаревшее использование объектов | Да | Информационный | Дефект кода | `deprecated` |
+| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Устаревшие объекты платформы 8.3.12 | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index 055a3f60cc5..6f31f95cf59 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -1,4 +1,4 @@
-# <Diagnostic name> (DeprecatedAttributes8312)
+# Deprecated 8.3.12 platform features. (DeprecatedAttributes8312)
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 7eb695f67f9..5088bbd207c 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -32,7 +32,7 @@ Total: **94**
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
 | [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
-| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | <Diagnostic name> | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
index 59d1653da67..cba975748e0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
@@ -58,9 +58,7 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String SHOW_SCALE_RU = "ОтображатьШкалу";
   private static final String SHOW_SCALE_EN = "ShowScale";
   private static final String SCALE_LINES_RU = "ЛинииШкалы";
-  //private static final String SCALE_LINES_EN = "ScaleLines";
   private static final String SCALE_COLOR_RU = "ЦветШкалы";
-  //private static final String SCALE_COLOR_EN = "ScaleColor";
   private static final String SHOW_SERIES_SCALE_LABELS_RU = "ОтображатьПодписиШкалыСерий";
   private static final String SHOW_SERIES_SCALE_LABELS_EN = "ShowSeriesScaleLabels";
   private static final String SHOW_POINTS_SCALE_LABELS_RU = "ОтображатьПодписиШкалыТочек";
@@ -101,7 +99,6 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String SET_PALETTE_RU = "УстановитьПалитру";
 
   // Global context enum
-  private static final String CHART_LABELS_ORIENTATION_EN = "ChartLabelsOrientation";
   private static final String CHART_LABELS_ORIENTATION_RU = "ОриентацияМетокДиаграммы";
 
   // Global context enum attribute
@@ -114,12 +111,78 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String CLEAR_EVENT_LOG_EN = "ClearEventLog";
   private static final String CLEAR_EVENT_LOG_RU = "ОчиститьЖурналРегистрации";
 
-  private static final HashMap<String, String> NEW_ATTRIBUTES = new HashMap<>();
+  private static final HashMap<String, String> NEW_ATTRIBUTES_AND_METHODS = new HashMap<>();
   static {
-    NEW_ATTRIBUTES.put(SHOW_SCALE_RU, "ОтображатьШкалы");
-    NEW_ATTRIBUTES.put(SHOW_SCALE_EN, "ShowScales");
-    NEW_ATTRIBUTES.put(SCALE_LINES_RU, "ЛинииШкал");
-    NEW_ATTRIBUTES.put(SCALE_COLOR_RU, "ЦветШкал");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_RU.toLowerCase(), "ОтображатьШкалы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_EN.toLowerCase(), "ShowScales");
+    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_LINES_RU.toLowerCase(), "ЛинииШкал");
+    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_COLOR_RU.toLowerCase(), "ЦветШкал");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_RU.toLowerCase(),
+      "ШкалаСерий.ПоложениеПодписейШкалы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_EN.toLowerCase(),
+      "SeriesScale.ScaleLabelLocation");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_RU.toLowerCase(),
+      "ШкалаТочек.ПоложениеПодписейШкалы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_EN.toLowerCase(),
+      "PointsScale.ScaleLabelLocation");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_RU.toLowerCase(),
+      "ШкалаЗначений.ПоложениеПодписейШкалы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_EN.toLowerCase(),
+      "ValuesScale.ScaleLabelLocation");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_RU.toLowerCase(),
+      "ШкалаЗначений.ОтображениеЛинийСетки");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_EN.toLowerCase(),
+      "ValuesScale.GridLinesShowMode");
+    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_RU.toLowerCase(),
+      "ШкалаЗначений.ФорматПодписей");
+    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_EN.toLowerCase(),
+      "ValuesScale.LabelFormat");
+    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_RU.toLowerCase(),
+      "ШкалаТочек.ОриентацияПодписей");
+    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_EN.toLowerCase(),
+      "PointsScale.LabelOrientation");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_RU.toLowerCase(),
+      "одно из свойств ОбластьЛегендыДиаграммы, " +
+      "ОбластьЛегендыДиаграммыГанта или ОбластьЛегендыСводнойДиаграммы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_EN.toLowerCase(),
+      "one of the properties of ChartLegendArea, " +
+      "GanttChartLegendArea or PivotChartLegendArea");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_EN.toLowerCase(),
+      "one of the properties of ChartTitleArea, " +
+      "GanttChartTitleArea or PivotChartTitleArea");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_RU.toLowerCase(),
+      "одно из свойств ОбластьЗаголовкаДиаграммы, " +
+      "ОбластьЗаголовкаДиаграммыГанта или ОбластьЗаголовкаСводнойДиаграммы");
+    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_EN.toLowerCase(),
+      "ColorPaletteDescription.ColorPalette");
+    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.ПалитраЦветов");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_EN.toLowerCase(),
+      "ColorPaletteDescription.GradientPaletteStartColor");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.ЦветНачалаГрадиентнойПалитры");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_EN.toLowerCase(),
+      "ColorPaletteDescription.GradientPaletteEndColor");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.ЦветКонцаГрадиентнойПалитры");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_EN.toLowerCase(),
+      "ColorPaletteDescription.GradientPaletteMaxColors");
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.МаксимальноеКоличествоЦветовГрадиентнойПалитры");
+    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_EN.toLowerCase(),
+      "ColorPaletteDescription.GetPalette");
+    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.ПолучитьПалитру");
+    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_EN.toLowerCase(),
+      "ColorPaletteDescription.SetPalette");
+    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_RU.toLowerCase(),
+      "ОписаниеПалитрыЦветов.УстановитьПалитру");
+    NEW_ATTRIBUTES_AND_METHODS.put(CHART_LABELS_ORIENTATION_RU.toLowerCase(),
+      "ОриентацияПодписейДиаграммы");
+    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN.toLowerCase(),
+      "AlwaysHorizontal");
+    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU.toLowerCase(),
+      "ГоризонтальнаяВсегда");
   }
 
   private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
@@ -214,7 +277,7 @@ private static String getMetaobjectNameRegex(Metaobject metaobject) {
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final Pattern CHART_LABELS_ORIENTATION_PATTERN = Pattern.compile(
-    CHART_LABELS_ORIENTATION_EN + "|" + CHART_LABELS_ORIENTATION_RU,
+    CHART_LABELS_ORIENTATION_RU,
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final Pattern CHILD_FORM_ITEMS_GROUP_NAME_PATTERN = Pattern.compile(
@@ -237,8 +300,14 @@ public DeprecatedAttributes8312Diagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
 
-    if (CHART_METHODS_PATTERN.matcher(ctx.methodName().getText()).matches()) {
-      diagnosticStorage.addDiagnostic(ctx);
+    Matcher matcher = CHART_METHODS_PATTERN.matcher(ctx.methodName().getText());
+    if (matcher.matches()) {
+      String deprecatedMethod = matcher.group();
+      String message = String.format(info.getResourceString("deprecatedMethodsMessage"),
+        deprecatedMethod,
+        Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedMethod.toLowerCase()),
+          String::new));
+      diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
 
     return super.visitMethodCall(ctx);
@@ -246,8 +315,12 @@ public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
 
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
-    if (CLEAR_EVENT_LOG_PATTERN.matcher(ctx.methodName().getText()).matches()) {
-      diagnosticStorage.addDiagnostic(ctx);
+    Matcher matcher = CLEAR_EVENT_LOG_PATTERN.matcher(ctx.methodName().getText());
+    if (matcher.matches()) {
+      String deprecatedMethod = ctx.getStart().getText();
+      String message = String.format(info.getResourceString("deprecatedGlobalMethodsMessage"),
+        deprecatedMethod);
+      diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
     return super.visitGlobalMethodCall(ctx);
   }
@@ -267,8 +340,14 @@ public ParseTree visitAccessProperty(BSLParser.AccessPropertyContext ctx) {
 
   @Override
   public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx) {
-    if (CHART_LABELS_ORIENTATION_PATTERN.matcher(ctx.getStart().getText()).matches()) {
-      diagnosticStorage.addDiagnostic(ctx);
+    Matcher matcher = CHART_LABELS_ORIENTATION_PATTERN.matcher(ctx.getStart().getText());
+    if (matcher.matches()) {
+      String deprecatedEnum = ctx.getStart().getText();
+      String message = String.format(info.getResourceString("deprecatedEnumNameMessage"),
+        deprecatedEnum,
+        Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedEnum.toLowerCase()),
+          String::new));
+      diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
 
     return super.visitComplexIdentifier(ctx);
@@ -292,7 +371,8 @@ private void checkDeprecatedAttributes(BSLParserRuleContext ctx,
         String deprecatedAttribute = deprecatedAttributesMatcher.group();
         String message = String.format(info.getResourceString("deprecatedAttributeMessage"),
           deprecatedAttribute,
-          Objects.requireNonNullElseGet(NEW_ATTRIBUTES.get(deprecatedAttribute), String::new));
+          Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedAttribute.toLowerCase()),
+            String::new));
 
         diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
       }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
index 307dc884194..f31c37eca7f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -67,19 +67,31 @@ public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
 
   private static final HashMap<String, String> newMethods = new HashMap<>();
   static {
-    newMethods.put(SET_SHORT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.УстановитьКраткийЗаголовок");
-    newMethods.put(GET_SHORT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.ПолучитьКраткийЗаголовок");
-    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.УстановитьЗаголовок");
-    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_RU, "КлиентскоеПриложение.ПолучитьЗаголовок");
-    newMethods.put(BASE_FONT_CURRENT_VARIANT_RU, "КлиентскоеПриложение.ТекущийВариантОсновногоШрифта");
-    newMethods.put(CLIENT_INTERFACE_VARIANT_RU, "КлиентскоеПриложение.ТекущийВариантИнтерфейса");
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(),
+      "КлиентскоеПриложение.УстановитьКраткийЗаголовок");
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(),
+      "КлиентскоеПриложение.ПолучитьКраткийЗаголовок");
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(),
+      "КлиентскоеПриложение.УстановитьЗаголовок");
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(),
+      "КлиентскоеПриложение.ПолучитьЗаголовок");
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_RU.toLowerCase(),
+      "КлиентскоеПриложение.ТекущийВариантОсновногоШрифта");
+    newMethods.put(CLIENT_INTERFACE_VARIANT_RU.toLowerCase(),
+      "КлиентскоеПриложение.ТекущийВариантИнтерфейса");
 
-    newMethods.put(SET_SHORT_APPLICATION_CAPTION_EN, "ClientApplication.SetShortCaption");
-    newMethods.put(GET_SHORT_APPLICATION_CAPTION_EN, "ClientApplication.GetShortCaption");
-    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_EN, "ClientApplication.SetCaption");
-    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_EN, "ClientApplication.GetCaption");
-    newMethods.put(BASE_FONT_CURRENT_VARIANT_EN, "ClientApplication.CurrentBaseFontVariant");
-    newMethods.put(CLIENT_INTERFACE_VARIANT_EN, "ClientApplication.CurrentInterfaceVariant");
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(),
+      "ClientApplication.SetShortCaption");
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(),
+      "ClientApplication.GetShortCaption");
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(),
+      "ClientApplication.SetCaption");
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(),
+      "ClientApplication.GetCaption");
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_EN.toLowerCase(),
+      "ClientApplication.CurrentBaseFontVariant");
+    newMethods.put(CLIENT_INTERFACE_VARIANT_EN.toLowerCase(),
+      "ClientApplication.CurrentInterfaceVariant");
   }
 
   private static String getRegex() {
@@ -110,7 +122,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     Matcher matcher = METHOD_PATTERN.matcher(ctx.methodName().getText());
     if (matcher.matches()) {
       diagnosticStorage.addDiagnostic(ctx,
-        info.getMessage(matcher.group(), newMethods.getOrDefault(matcher.group(), "")));
+        info.getMessage(matcher.group(), newMethods.getOrDefault(matcher.group().toLowerCase(), "")));
     }
 
     return super.visitGlobalMethodCall(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 1d004a2dca0..a6dcbbd3085 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
@@ -207,13 +207,13 @@
             "$id": "#/definitions/DeletingCollectionItem"
         },
         "DeprecatedAttributes8312": {
-            "description": "<Diagnostic name>",
+            "description": "Deprecated 8.3.12 platform features.",
             "default": true,
             "type": [
                 "boolean",
                 "object"
             ],
-            "title": "<Diagnostic name>",
+            "title": "Deprecated 8.3.12 platform features.",
             "$id": "#/definitions/DeprecatedAttributes8312"
         },
         "DeprecatedCurrentDate": {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
index f56bffb6cd7..232ae5da5db 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_en.properties
@@ -1,3 +1,6 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
-deprecatedAttributeMessage=\"%s\" attribute is deprecated. You should use \"%s\"
+diagnosticMessage=%s
+diagnosticName=Deprecated 8.3.12 platform features.
+deprecatedAttributeMessage=\"%s\" attribute is deprecated. You should use %s
+deprecatedMethodsMessage=\"%s\" method is deprecated. You should use \"%s\"
+deprecatedEnumNameMessage=Deprecated enum name \"%s\". You should use \"%s\" instead.
+deprecatedGlobalMethodsMessage=\"%s\" global method is deprecated. You should not use it.
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
index f20e7315b97..f59017a7ca8 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic_ru.properties
@@ -1,3 +1,6 @@
 diagnosticMessage=%s
-diagnosticName=Устаревшее использование объектов
-deprecatedAttributeMessage=Атрибут \"%s\" устарел. Вместо него стоит использовать \"%s\"
+diagnosticName=Устаревшие объекты платформы 8.3.12
+deprecatedAttributeMessage=Атрибут \"%s\" устарел. Вместо него стоит использовать %s
+deprecatedMethodsMessage=Метод \"%s\" устарел. Вместо него стоит использовать \"%s\"
+deprecatedEnumNameMessage=Используется старое наименование \"%s\". Вместо него необходимо использовать \"%s\"
+deprecatedGlobalMethodsMessage=Метод \"%s\" устарел и больше не используется
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
index 19d2c26bf87..7395706af25 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312DiagnosticTest.java
@@ -38,9 +38,53 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(46);
-//    assertThat(diagnostics, true)
-//      .hasRange(6, 0, 6, 20);
+    assertThat(diagnostics).hasSize(45);
+    assertThat(diagnostics, true)
+      .hasRange(1, 37, 1, 53)
+      .hasRange(2, 30, 2, 41)
+      .hasRange(3, 30, 3, 40)
+      .hasRange(4, 30, 4, 58)
+      .hasRange(5, 30, 5, 58)
+      .hasRange(6, 30, 6, 61)
+      .hasRange(7, 30, 7, 59)
+      .hasRange(8, 30, 8, 50)
+      .hasRange(9, 30, 9, 46)
+      .hasRange(13, 17, 13, 27)
+      .hasRange(14, 17, 14, 39)
+      .hasRange(15, 17, 15, 39)
+      .hasRange(16, 17, 16, 39)
+      .hasRange(17, 17, 17, 37)
+      .hasRange(18, 17, 18, 34)
+      .hasRange(19, 17, 19, 35)
+      .hasRange(23, 13, 23, 31)
+      .hasRange(24, 13, 24, 33)
+      .hasRange(25, 18, 25, 36)
+      .hasRange(26, 18, 26, 38)
+      .hasRange(27, 20, 27, 38)
+      .hasRange(28, 20, 28, 40)
+      .hasRange(30, 13, 30, 27)
+      .hasRange(31, 13, 31, 42)
+      .hasRange(32, 13, 32, 41)
+      .hasRange(33, 13, 33, 60)
+      .hasRange(35, 21, 35, 38)
+      .hasRange(36, 14, 36, 45)
+      .hasRange(40, 9, 40, 20)
+      .hasRange(41, 14, 41, 25)
+      .hasRange(42, 14, 42, 25)
+      .hasRange(43, 9, 43, 19)
+      .hasRange(44, 14, 44, 24)
+      .hasRange(45, 14, 45, 24)
+      .hasRange(47, 9, 47, 22)
+      .hasRange(48, 9, 48, 35)
+      .hasRange(49, 9, 49, 33)
+      .hasRange(50, 9, 50 ,34)
+      .hasRange(52, 10, 52, 22)
+      .hasRange(53, 10, 53, 26)
+      .hasRange(58, 17, 58, 46)
+      .hasRange(62, 4, 62, 36)
+      .hasRange(66, 4, 66, 25)
+      .hasRange(70, 54, 70, 69)
+      .hasRange(74, 30, 74, 41);
 
   }
 }
diff --git a/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl
index 1916e3b2c8c..9e8ea07b2c2 100644
--- a/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedAttributes8312Diagnostic.bsl
@@ -59,10 +59,6 @@ EndProcedure
     Ориентация = ОриентацияМетокДиаграммы.Авто;
 КонецПроцедуры
 
-Procedure Test3()
-    test = ChartLabelsOrientation.Auto;
-EndProcedure
-
 Процедура Тест4()
     ОчиститьЖурналРегистрации(Отбор);
 КонецПроцедуры

From 02f3293074f2456b0f941591ba63a655ca4dd53a Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 25 Apr 2020 23:29:52 +0700
Subject: [PATCH 144/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B1=D0=BB=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 68 +++++++++++++++++++
 ...turnsSamePrimitiveDiagnostic_en.properties |  2 +
 ...turnsSamePrimitiveDiagnostic_ru.properties |  2 +
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 23 +++++++
 .../FunctionReturnsSameValueDiagnostic.bsl    | 52 ++++++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
new file mode 100644
index 00000000000..6c7c1c750b4
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -0,0 +1,68 @@
+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.utils.Ranges;
+import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.checkerframework.checker.nullness.Opt;
+import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+
+import javax.tools.Diagnostic;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.BADPRACTICE
+  }
+
+)
+public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+  public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+    var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
+    if (tree.size() > 1){
+      var set = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(BSLParser.ReturnStatementContext::expression)
+        .flatMap(Stream::ofNullable)
+        .map(BSLParser.ExpressionContext::getText)
+        .collect(Collectors.toSet());
+      if (set.size() == 1) {
+        var relatedInformation = tree.stream()
+          .map(BSLParser.ReturnStatementContext.class::cast)
+          .map(statement ->
+            RelatedInformation.create(
+              documentContext.getUri(),
+              Ranges.create(statement.getStart()),
+              info.getMessage()))
+          .collect(Collectors.toList());
+        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
+      }
+    }
+    return ctx;
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
new file mode 100644
index 00000000000..df22ba92595
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
+diagnosticName=Функция всегда возвращает одно и то же значение
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
new file mode 100644
index 00000000000..1517ec60634
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -0,0 +1,23 @@
+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 FunctionReturnsSamePrimitiveDiagnosticTest extends AbstractDiagnosticTest<FunctionReturnsSamePrimitiveDiagnostic> {
+  FunctionReturnsSamePrimitiveDiagnosticTest() {
+    super(FunctionReturnsSamePrimitiveDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+  assertThat(diagnostics).hasSize(4);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
new file mode 100644
index 00000000000..c8e246d08f3
--- /dev/null
+++ b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
@@ -0,0 +1,52 @@
+Функция ПроверитьСтроку(Знач СтрокаТаблицы) // <-- ошибка
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+КонецФункции
+
+Функция БудемТестироватьФункциональность()
+    Возврат Ложь;
+КонецФункции
+
+Функция ВернутьСтроку()
+    Возврат "Истина";
+КонецФункции
+
+Процедура СделаемЧтоНибудь()
+    Значение = Истина;
+    Возврат;
+КонецПроцедуры
+
+Функция Метод1() // <-- ошибка
+    Значение = "Фича";
+    Если Фича = "Дирижабль" Тогда
+        Возврат "Фича";
+    ИначеЕсли Фича = "Ага" Тогда
+        Возврат "Фича";
+    КонецЕсли;
+    Возврат "Фича";
+КонецФункции
+
+Функция СтавкаНДС(Ставка) // <-- ошибка
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат 20;
+    КонецЕсли;
+    Возврат 20;
+КонецФункции
+
+// надо бы подумать как правильно диагностировать
+// по идее ошибка
+Функция СтавкаНДС2(Ставка)
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат Значение;
+    КонецЕсли;
+    Возврат Значение;
+КонецФункции
\ No newline at end of file

From f687ef3626081d41c1d5444d2d6c337c1f373679 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:23:36 +0700
Subject: [PATCH 145/444] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D0=B8=D0=B2=D0=BE=D0=B2,=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20ru,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BA=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           | 71 ++++++++++++++
 .../FunctionReturnsSamePrimitive.md           | 36 +++++++
 ...unctionReturnsSamePrimitiveDiagnostic.java | 96 +++++++++++++------
 ...turnsSamePrimitiveDiagnostic_en.properties |  5 +-
 ...turnsSamePrimitiveDiagnostic_ru.properties |  5 +-
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 10 +-
 ...unctionReturnsSamePrimitiveDiagnostic.bsl} |  3 +-
 7 files changed, 192 insertions(+), 34 deletions(-)
 create mode 100644 docs/diagnostics/FunctionReturnsSamePrimitive.md
 create mode 100644 docs/en/diagnostics/FunctionReturnsSamePrimitive.md
 rename src/test/resources/diagnostics/{FunctionReturnsSameValueDiagnostic.bsl => FunctionReturnsSamePrimitiveDiagnostic.bsl} (94%)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..464ba00e5f5
--- /dev/null
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,71 @@
+# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Функция не должна возвращать одно и тоже примитивное значение. Если результат функции не учитывается - то нужно функцию 
+переписать на процедуру.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Плохо:
+```bsl
+Функция ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+
+КонецФункции
+```
+
+Хорошо:
+```bsl
+Процедура ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    Иначе
+        ДелаемЧтотоДругоеИзВеткиИначе();
+    КонецЕсли;
+
+КонецПроцедуры
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 6c7c1c750b4..c0dc94b38af 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -1,5 +1,27 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 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;
@@ -8,35 +30,31 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
-import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.checkerframework.checker.nullness.Opt;
-import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+import org.eclipse.lsp4j.Range;
 
-import javax.tools.Diagnostic;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MAJOR,
+  minutesToFix = 5,
   tags = {
+    DiagnosticTag.DESIGN,
     DiagnosticTag.BADPRACTICE
   }
 
 )
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
+
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -44,25 +62,49 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
-    if (tree.size() > 1){
-      var set = tree.stream()
+    if (tree.size() > 1) {
+      var expressions = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
         .map(BSLParser.ReturnStatementContext::expression)
         .flatMap(Stream::ofNullable)
-        .map(BSLParser.ExpressionContext::getText)
-        .collect(Collectors.toSet());
-      if (set.size() == 1) {
-        var relatedInformation = tree.stream()
-          .map(BSLParser.ReturnStatementContext.class::cast)
-          .map(statement ->
-            RelatedInformation.create(
-              documentContext.getUri(),
-              Ranges.create(statement.getStart()),
-              info.getMessage()))
-          .collect(Collectors.toList());
-        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
-      }
+        .collect(Collectors.toList());
+
+      expressions.stream()
+        .map(expression -> Trees.findAllRuleNodes(expression, BSLParser.RULE_complexIdentifier))
+        .filter(Collection::isEmpty)
+        .findAny()
+        .ifPresent(
+          parseTrees -> checkPrimitiveValue(ctx, tree, expressions)
+        );
     }
     return ctx;
   }
+
+  private void checkPrimitiveValue(
+    BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
+
+    var set = expressions.stream().map(BSLParser.ExpressionContext::getText).collect(Collectors.toSet());
+    if (set.size() == 1) {
+      var relatedInformation = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(statement -> RelatedInformation.create(
+          documentContext.getUri(),
+          Ranges.create(statement.getStart()),
+          info.getResourceString(KEY_MESSAGE)))
+        .collect(Collectors.toList());
+      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), info.getMessage(), relatedInformation);
+    }
+
+  }
+
+  private Range getSubNameRange(ParserRuleContext ctx) {
+    return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
+      .map(BSLParser.SubContext.class::cast)
+      .map(context -> documentContext.getSymbolTree().getMethodSymbol(context))
+      .filter(Optional::isPresent)
+      .map(Optional::get)
+      .map(MethodSymbol::getSubNameRange)
+      .orElse(Ranges.create(ctx.getStart()));
+  }
+
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index 66831715dfd..fb0ac7ddbfc 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Check that the same primitive value is returned in the function
+diagnosticName=The function always returns the same primitive value
+diagnosticMessageReturnStatement=Repeat return value
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index df22ba92595..2ac2ec79e1b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
-diagnosticName=Функция всегда возвращает одно и то же значение
+diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
+diagnosticName=Функция всегда возвращает одно и то же примитивное значение
+diagnosticMessageReturnStatement=Повтор возвращаемого значения
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1517ec60634..1af20cc2524 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,5 +1,6 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +18,14 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-  assertThat(diagnostics).hasSize(4);
+  assertThat(diagnostics)
+    .hasSize(3)
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(0, 8, 0, 23)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(25, 8, 25, 14)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(35, 8, 35, 17)));
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
similarity index 94%
rename from src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
rename to src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index c8e246d08f3..66f0df2975e 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -41,8 +41,7 @@
     Возврат 20;
 КонецФункции
 
-// надо бы подумать как правильно диагностировать
-// по идее ошибка
+// здесь нет ошибки, т.к. проверка только на примитивы
 Функция СтавкаНДС2(Ставка)
     Значение = 20;
     Если Ставка = "Ставка18" Тогда

From 4421d3b4737e0b330b7df794b8564ca8f967e801 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:38:38 +0700
Subject: [PATCH 146/444] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D1=8F,=20=D0=B7=D0=B0=D0=BF=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=20=D0=BF=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=BB=D0=B8=D1=86=D0=B5=D0=BD=D0=B7=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           | 18 +++----
 docs/diagnostics/index.md                     |  5 +-
 .../FunctionReturnsSamePrimitive.md           | 51 ++++++++++++++++---
 docs/en/diagnostics/index.md                  |  5 +-
 .../configuration/diagnostics-schema.json     | 10 ++++
 .../languageserver/configuration/schema.json  |  3 ++
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 21 ++++++++
 7 files changed, 92 insertions(+), 21 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 464ba00e5f5..cbd70345b65 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,8 +1,8 @@
-# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+# Функция всегда возвращает одно и то же примитивное значение (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -55,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"FunctionReturnsSamePrimitive": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index d1eccfc2ac0..0fab59f2d5f 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **88**
+Общее количество: **89**
 
 * Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **29**
+* Ошибка: **30**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -40,6 +40,7 @@
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | Функция всегда возвращает одно и то же примитивное значение | Да | Важный | Ошибка | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | Функция должна содержать возврат | Да | Важный | Ошибка | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | Использование метода ПолучитьФорму | Да | Важный | Ошибка | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | Одинаковые выражения слева и справа от "foo" оператора | Да | Важный | Ошибка | `suspicious` |
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index 4e7e0f78ada..a7b5d484497 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,16 +1,51 @@
-# <Diagnostic name>
+# The function always returns the same primitive value (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+A function should not return the same primitive value. If the result of the function isn't use into code, then you need the function
+rewrite to the procedure.
+
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+Bad:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+        Return True;
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+        Return True;
+     Else
+        Return True;
+    EndIf;
+
+EndFunction
+```
+
+Good:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+    Else
+        ActionElse();
+    EndIf;
+
+EndFunction
+```
+
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -20,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"FunctionReturnsSamePrimitive": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 92ef4e4c507..b22ab4029d5 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **88**
+Total: **89**
 
-* Error: **29**
+* Error: **30**
 * Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
@@ -40,6 +40,7 @@ Total: **88**
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious` |
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
index 3369ec036ca..a88716c7949 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics-schema.json
@@ -278,6 +278,16 @@
             "title": "Function name shouldn't start with \"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\"",
             "$id": "#/definitions/FunctionNameStartsWithGet"
         },
+        "FunctionReturnsSamePrimitive": {
+            "description": "The function always returns the same primitive value",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "The function always returns the same primitive value",
+            "$id": "#/definitions/FunctionReturnsSamePrimitive"
+        },
         "FunctionShouldHaveReturn": {
             "description": "The function should have return",
             "default": null,
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 c34797acb3e..bcd5efb647f 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
@@ -170,6 +170,9 @@
                 "FunctionNameStartsWithGet": {
                     "$ref": "diagnostics-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
+                "FunctionReturnsSamePrimitive": {
+                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "diagnostics-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1af20cc2524..b4d1a3cd769 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.utils.Ranges;

From d4e585a1e9c999c950d5c6b1971d84ce1f8678e8 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 25 Apr 2020 23:29:52 +0700
Subject: [PATCH 147/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B1=D0=BB=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 68 +++++++++++++++++++
 ...turnsSamePrimitiveDiagnostic_en.properties |  2 +
 ...turnsSamePrimitiveDiagnostic_ru.properties |  2 +
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 23 +++++++
 .../FunctionReturnsSameValueDiagnostic.bsl    | 52 ++++++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
new file mode 100644
index 00000000000..6c7c1c750b4
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -0,0 +1,68 @@
+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.utils.Ranges;
+import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.checkerframework.checker.nullness.Opt;
+import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+
+import javax.tools.Diagnostic;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.BADPRACTICE
+  }
+
+)
+public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+  public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+    var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
+    if (tree.size() > 1){
+      var set = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(BSLParser.ReturnStatementContext::expression)
+        .flatMap(Stream::ofNullable)
+        .map(BSLParser.ExpressionContext::getText)
+        .collect(Collectors.toSet());
+      if (set.size() == 1) {
+        var relatedInformation = tree.stream()
+          .map(BSLParser.ReturnStatementContext.class::cast)
+          .map(statement ->
+            RelatedInformation.create(
+              documentContext.getUri(),
+              Ranges.create(statement.getStart()),
+              info.getMessage()))
+          .collect(Collectors.toList());
+        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
+      }
+    }
+    return ctx;
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
new file mode 100644
index 00000000000..df22ba92595
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
+diagnosticName=Функция всегда возвращает одно и то же значение
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
new file mode 100644
index 00000000000..1517ec60634
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -0,0 +1,23 @@
+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 FunctionReturnsSamePrimitiveDiagnosticTest extends AbstractDiagnosticTest<FunctionReturnsSamePrimitiveDiagnostic> {
+  FunctionReturnsSamePrimitiveDiagnosticTest() {
+    super(FunctionReturnsSamePrimitiveDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+  assertThat(diagnostics).hasSize(4);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
new file mode 100644
index 00000000000..c8e246d08f3
--- /dev/null
+++ b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
@@ -0,0 +1,52 @@
+Функция ПроверитьСтроку(Знач СтрокаТаблицы) // <-- ошибка
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+КонецФункции
+
+Функция БудемТестироватьФункциональность()
+    Возврат Ложь;
+КонецФункции
+
+Функция ВернутьСтроку()
+    Возврат "Истина";
+КонецФункции
+
+Процедура СделаемЧтоНибудь()
+    Значение = Истина;
+    Возврат;
+КонецПроцедуры
+
+Функция Метод1() // <-- ошибка
+    Значение = "Фича";
+    Если Фича = "Дирижабль" Тогда
+        Возврат "Фича";
+    ИначеЕсли Фича = "Ага" Тогда
+        Возврат "Фича";
+    КонецЕсли;
+    Возврат "Фича";
+КонецФункции
+
+Функция СтавкаНДС(Ставка) // <-- ошибка
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат 20;
+    КонецЕсли;
+    Возврат 20;
+КонецФункции
+
+// надо бы подумать как правильно диагностировать
+// по идее ошибка
+Функция СтавкаНДС2(Ставка)
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат Значение;
+    КонецЕсли;
+    Возврат Значение;
+КонецФункции
\ No newline at end of file

From e40a786fef5f118b230bcc336ec0892a5cc3d6af Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:23:36 +0700
Subject: [PATCH 148/444] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D0=B8=D0=B2=D0=BE=D0=B2,=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20ru,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BA=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           | 71 ++++++++++++++
 .../FunctionReturnsSamePrimitive.md           | 36 +++++++
 ...unctionReturnsSamePrimitiveDiagnostic.java | 96 +++++++++++++------
 ...turnsSamePrimitiveDiagnostic_en.properties |  5 +-
 ...turnsSamePrimitiveDiagnostic_ru.properties |  5 +-
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 10 +-
 ...unctionReturnsSamePrimitiveDiagnostic.bsl} |  3 +-
 7 files changed, 192 insertions(+), 34 deletions(-)
 create mode 100644 docs/diagnostics/FunctionReturnsSamePrimitive.md
 create mode 100644 docs/en/diagnostics/FunctionReturnsSamePrimitive.md
 rename src/test/resources/diagnostics/{FunctionReturnsSameValueDiagnostic.bsl => FunctionReturnsSamePrimitiveDiagnostic.bsl} (94%)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..464ba00e5f5
--- /dev/null
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,71 @@
+# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Функция не должна возвращать одно и тоже примитивное значение. Если результат функции не учитывается - то нужно функцию 
+переписать на процедуру.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Плохо:
+```bsl
+Функция ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+
+КонецФункции
+```
+
+Хорошо:
+```bsl
+Процедура ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    Иначе
+        ДелаемЧтотоДругоеИзВеткиИначе();
+    КонецЕсли;
+
+КонецПроцедуры
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 6c7c1c750b4..c0dc94b38af 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -1,5 +1,27 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 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;
@@ -8,35 +30,31 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
-import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.checkerframework.checker.nullness.Opt;
-import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+import org.eclipse.lsp4j.Range;
 
-import javax.tools.Diagnostic;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MAJOR,
+  minutesToFix = 5,
   tags = {
+    DiagnosticTag.DESIGN,
     DiagnosticTag.BADPRACTICE
   }
 
 )
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
+
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -44,25 +62,49 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
-    if (tree.size() > 1){
-      var set = tree.stream()
+    if (tree.size() > 1) {
+      var expressions = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
         .map(BSLParser.ReturnStatementContext::expression)
         .flatMap(Stream::ofNullable)
-        .map(BSLParser.ExpressionContext::getText)
-        .collect(Collectors.toSet());
-      if (set.size() == 1) {
-        var relatedInformation = tree.stream()
-          .map(BSLParser.ReturnStatementContext.class::cast)
-          .map(statement ->
-            RelatedInformation.create(
-              documentContext.getUri(),
-              Ranges.create(statement.getStart()),
-              info.getMessage()))
-          .collect(Collectors.toList());
-        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
-      }
+        .collect(Collectors.toList());
+
+      expressions.stream()
+        .map(expression -> Trees.findAllRuleNodes(expression, BSLParser.RULE_complexIdentifier))
+        .filter(Collection::isEmpty)
+        .findAny()
+        .ifPresent(
+          parseTrees -> checkPrimitiveValue(ctx, tree, expressions)
+        );
     }
     return ctx;
   }
+
+  private void checkPrimitiveValue(
+    BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
+
+    var set = expressions.stream().map(BSLParser.ExpressionContext::getText).collect(Collectors.toSet());
+    if (set.size() == 1) {
+      var relatedInformation = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(statement -> RelatedInformation.create(
+          documentContext.getUri(),
+          Ranges.create(statement.getStart()),
+          info.getResourceString(KEY_MESSAGE)))
+        .collect(Collectors.toList());
+      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), info.getMessage(), relatedInformation);
+    }
+
+  }
+
+  private Range getSubNameRange(ParserRuleContext ctx) {
+    return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
+      .map(BSLParser.SubContext.class::cast)
+      .map(context -> documentContext.getSymbolTree().getMethodSymbol(context))
+      .filter(Optional::isPresent)
+      .map(Optional::get)
+      .map(MethodSymbol::getSubNameRange)
+      .orElse(Ranges.create(ctx.getStart()));
+  }
+
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index 66831715dfd..fb0ac7ddbfc 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Check that the same primitive value is returned in the function
+diagnosticName=The function always returns the same primitive value
+diagnosticMessageReturnStatement=Repeat return value
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index df22ba92595..2ac2ec79e1b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
-diagnosticName=Функция всегда возвращает одно и то же значение
+diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
+diagnosticName=Функция всегда возвращает одно и то же примитивное значение
+diagnosticMessageReturnStatement=Повтор возвращаемого значения
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1517ec60634..1af20cc2524 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,5 +1,6 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +18,14 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-  assertThat(diagnostics).hasSize(4);
+  assertThat(diagnostics)
+    .hasSize(3)
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(0, 8, 0, 23)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(25, 8, 25, 14)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(35, 8, 35, 17)));
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
similarity index 94%
rename from src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
rename to src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index c8e246d08f3..66f0df2975e 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -41,8 +41,7 @@
     Возврат 20;
 КонецФункции
 
-// надо бы подумать как правильно диагностировать
-// по идее ошибка
+// здесь нет ошибки, т.к. проверка только на примитивы
 Функция СтавкаНДС2(Ставка)
     Значение = 20;
     Если Ставка = "Ставка18" Тогда

From c9a65c76b9e44a8eb71347890ffe7287598a1bb4 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:38:38 +0700
Subject: [PATCH 149/444] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D1=8F,=20=D0=B7=D0=B0=D0=BF=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=20=D0=BF=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=BB=D0=B8=D1=86=D0=B5=D0=BD=D0=B7=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           | 18 +++----
 docs/diagnostics/index.md                     | 12 ++---
 .../FunctionReturnsSamePrimitive.md           | 51 ++++++++++++++++---
 docs/en/diagnostics/index.md                  | 12 ++---
 .../configuration/parameters-schema.json      | 10 ++++
 .../languageserver/configuration/schema.json  |  3 ++
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 21 ++++++++
 7 files changed, 94 insertions(+), 33 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 464ba00e5f5..cbd70345b65 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,8 +1,8 @@
-# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+# Функция всегда возвращает одно и то же примитивное значение (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -55,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"FunctionReturnsSamePrimitive": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index eac9427cc9b..0fab59f2d5f 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **93**
+Общее количество: **89**
 
-* Дефект кода: **58**
+* Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **31**
+* Ошибка: **30**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -24,27 +24,23 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | Функция всегда возвращает одно и то же примитивное значение | Да | Важный | Ошибка | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | Функция должна содержать возврат | Да | Важный | Ошибка | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | Использование метода ПолучитьФорму | Да | Важный | Ошибка | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | Одинаковые выражения слева и справа от "foo" оператора | Да | Важный | Ошибка | `suspicious` |
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index 4e7e0f78ada..a7b5d484497 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,16 +1,51 @@
-# <Diagnostic name>
+# The function always returns the same primitive value (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+A function should not return the same primitive value. If the result of the function isn't use into code, then you need the function
+rewrite to the procedure.
+
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+Bad:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+        Return True;
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+        Return True;
+     Else
+        Return True;
+    EndIf;
+
+EndFunction
+```
+
+Good:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+    Else
+        ActionElse();
+    EndIf;
+
+EndFunction
+```
+
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -20,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"FunctionReturnsSamePrimitive": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 40af697dbe0..b22ab4029d5 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **93**
+Total: **89**
 
-* Error: **31**
-* Code smell: **58**
+* Error: **30**
+* Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -24,27 +24,23 @@ Total: **93**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious` |
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 5ade19e04ce..f91fbfa6928 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
@@ -344,6 +344,16 @@
             "title": "Function name shouldn't start with \"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\"",
             "$id": "#/definitions/FunctionNameStartsWithGet"
         },
+        "FunctionReturnsSamePrimitive": {
+            "description": "The function always returns the same primitive value",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "The function always returns the same primitive value",
+            "$id": "#/definitions/FunctionReturnsSamePrimitive"
+        },
         "FunctionShouldHaveReturn": {
             "description": "The function should have return",
             "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 e4e5668caff..7dea557b8e5 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
@@ -107,6 +107,9 @@
                 "FunctionNameStartsWithGet": {
                     "$ref": "parameters-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
+                "FunctionReturnsSamePrimitive": {
+                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1af20cc2524..b4d1a3cd769 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.utils.Ranges;

From 17fcd03e91d54dac680eff364a240876302c568b Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 02:14:16 +0700
Subject: [PATCH 150/444] =?UTF-8?q?+=20=D0=BF=D1=80=D0=B5=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/index.md                             | 11 ++++++++---
 docs/en/diagnostics/index.md                          | 11 ++++++++---
 .../configuration/parameters-schema.json              |  2 +-
 .../bsl/languageserver/configuration/schema.json      |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 0fab59f2d5f..2dfbde26f8d 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **89**
+Общее количество: **94**
 
-* Дефект кода: **55**
+* Дефект кода: **58**
 * Уязвимость: **2**
-* Ошибка: **30**
+* Ошибка: **32**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -24,19 +24,24 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index b22ab4029d5..2f31a4424d4 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **89**
+Total: **94**
 
-* Error: **30**
-* Code smell: **55**
+* Error: **32**
+* Code smell: **58**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -24,19 +24,24 @@ Total: **89**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
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 f91fbfa6928..382ac58cfa0 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
@@ -346,7 +346,7 @@
         },
         "FunctionReturnsSamePrimitive": {
             "description": "The function always returns the same primitive value",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
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 7dea557b8e5..22e7f39541f 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
@@ -108,7 +108,7 @@
                     "$ref": "parameters-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
                 "FunctionReturnsSamePrimitive": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                    "$ref": "parameters-schema.json#/definitions/FunctionReturnsSamePrimitive"
                 },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"

From c8ca3ba1d16ac0e4a1e64c1c5b6953a9ff0c4ce4 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 08:59:12 +0700
Subject: [PATCH 151/444] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 18 ++++++++++++---
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl | 22 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index c0dc94b38af..ba0f48586e9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -38,6 +38,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -54,6 +55,8 @@
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
+  private static final Pattern pattern = Pattern.compile(
+    "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -61,6 +64,17 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
 
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+
+    var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
+      .map(BSLParser.FuncDeclarationContext::subName)
+      .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
+      .isPresent();
+
+    // Исключаем подключаемые методы
+    if (abortCheck) {
+      return ctx;
+    }
+
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
     if (tree.size() > 1) {
       var expressions = tree.stream()
@@ -100,9 +114,7 @@ private void checkPrimitiveValue(
   private Range getSubNameRange(ParserRuleContext ctx) {
     return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
       .map(BSLParser.SubContext.class::cast)
-      .map(context -> documentContext.getSymbolTree().getMethodSymbol(context))
-      .filter(Optional::isPresent)
-      .map(Optional::get)
+      .flatMap(context -> documentContext.getSymbolTree().getMethodSymbol(context))
       .map(MethodSymbol::getSubNameRange)
       .orElse(Ranges.create(ctx.getStart()));
   }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 66f0df2975e..67f0824d2ea 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -48,4 +48,24 @@
         Возврат Значение;
     КонецЕсли;
     Возврат Значение;
-КонецФункции
\ No newline at end of file
+КонецФункции
+
+Функция Подключаемый_КакаяТоКоманда(Команда)
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Неопределено;
+    КонецЕсли;
+
+    Возврат Неопределено;
+
+КонецФункции
+
+Function Attachable_RandomAction(Command)
+
+    If ValueIsFilled(CurrentDate) Then
+        Return Undefined;
+    EndIf;
+
+    Return Undefined;
+
+EndFunction

From 4cef417ce48e4d7cb4a51bab5886da44ed343171 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 08:59:21 +0700
Subject: [PATCH 152/444] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=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=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/FunctionReturnsSamePrimitive.md  | 15 +++++++++++++++
 .../diagnostics/FunctionReturnsSamePrimitive.md   | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index cbd70345b65..41eb85dc3d6 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -46,6 +46,21 @@
 КонецПроцедуры
 ```
 
+## Особенности
+
+Из проверки исключаются подключаемые Функции. Например:
+```bsl
+Функция Подключаемый_КакаяТоКоманда(Команда)
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Неопределено;
+    КонецЕсли;
+
+    Возврат Неопределено;
+
+КонецФункции
+```
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index a7b5d484497..01ac1e2515f 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -46,6 +46,21 @@ Function CheckString(Val RowTable)
 EndFunction
 ```
 
+## Nuances
+
+Attachable functions excluded from the scan. Example:
+```bsl
+Function Attachable_RandomAction(Command)
+
+    If ValueIsFilled(CurrentDate) Then
+        Return Undefined;
+    EndIf;
+
+    Return Undefined;
+
+EndFunction
+```
+
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников

From 7fa19b13cdc6c26ae2e3b41dd362e2e8751ce2b0 Mon Sep 17 00:00:00 2001
From: Yuri Goncharuk <yukon39@gmail.com>
Date: Sat, 25 Apr 2020 14:50:01 +0300
Subject: [PATCH 153/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D1=83?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B2=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/cli/AnalyzeCommand.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 76b5e3b5ae1..f561c0e7e41 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -63,6 +63,9 @@
  *  -o, (--outputDir) &lt;arg&gt; -     Путь к каталогу размещения отчетов - результатов анализа.
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то файлы отчета будут сохранены в текущем каталоге запуска.
+ *  -w, (--workspaceDir) &lt;arg&gt; -  Путь к каталогу проекта относительно котого указыватся пути к исходным файлам.
+ *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
+ *                                то пути к исходным файлам будут показыватья относительно текущего каталога запуска.
  *  -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то будут использованы настройки по умолчанию.
@@ -95,6 +98,13 @@ private static class ReportersKeys extends ArrayList<String> {
     description = "Show this help message and exit")
   private boolean usageHelpRequested;
 
+  @Option(
+    names = {"-w", "--workspaceDir"},
+    description = "Workspace directory",
+    paramLabel = "<path>",
+    defaultValue = "")
+  private String workspaceDirOption;
+
   @Option(
     names = {"-s", "--srcDir"},
     description = "Source directory",
@@ -133,6 +143,12 @@ private static class ReportersKeys extends ArrayList<String> {
 
   public Integer call() {
 
+    Path workspaceDir = Absolute.path(workspaceDirOption);
+    if (!workspaceDir.toFile().exists()) {
+      LOGGER.error("Workspace dir `{}` is not exists", workspaceDir.toString());
+      return 1;
+    }
+
     Path srcDir = Absolute.path(srcDirOption);
     if (!srcDir.toFile().exists()) {
       LOGGER.error("Source dir `{}` is not exists", srcDir.toString());
@@ -152,14 +168,14 @@ public Integer call() {
     List<FileInfo> fileInfos;
     if (silentMode) {
       fileInfos = files.parallelStream()
-        .map((File file) -> getFileInfoFromFile(srcDir, file))
+        .map((File file) -> getFileInfoFromFile(workspaceDir, file))
         .collect(Collectors.toList());
     } else {
       try (ProgressBar pb = new ProgressBar("Analyzing files...", files.size(), ProgressBarStyle.ASCII)) {
         fileInfos = files.parallelStream()
           .map((File file) -> {
             pb.step();
-            return getFileInfoFromFile(srcDir, file);
+            return getFileInfoFromFile(workspaceDir, file);
           })
           .collect(Collectors.toList());
       }

From b27eb0b154d3a30df9085f409620f1988680ec9a Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 26 Apr 2020 03:13:38 +0300
Subject: [PATCH 154/444] docs

---
 README.md        | 2 ++
 docs/en/index.md | 2 ++
 docs/index.md    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index a4571c94557..1955ad13dc6 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,8 @@ Run analysis and get diagnostic info
   -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
+  -w, --workspaceDir=<path> 
+                           Workspace directory
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 
diff --git a/docs/en/index.md b/docs/en/index.md
index d389022690c..7b4d642e61f 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -82,6 +82,8 @@ Run analysis and get diagnostic info
   -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
+  -w, --workspaceDir=<path> 
+                           Workspace directory
 ```
 
 To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
diff --git a/docs/index.md b/docs/index.md
index 89819fd003a..647313e9d87 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -82,6 +82,8 @@ Run analysis and get diagnostic info
   -q, --silent             Silent mode
   -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
   -s, --srcDir=<path>      Source directory
+  -w, --workspaceDir=<path> 
+                           Workspace directory
 ```
 
 Для указания каталога расположения анализируемых исходников используется параметр `--srcDir` (сокращенно `-s`), за которым следует путь (относительный или абсолютный) к каталогу исходников. 

From 46b95f739ba76c00c18852ed8bd0cdb31a4fd71a Mon Sep 17 00:00:00 2001
From: Yuri Goncharuk <yukon39@gmail.com>
Date: Sun, 26 Apr 2020 10:58:57 +0200
Subject: [PATCH 155/444] =?UTF-8?q?FIX:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B8=20=D0=B8=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index f561c0e7e41..b4ca21035e2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -63,9 +63,9 @@
  *  -o, (--outputDir) &lt;arg&gt; -     Путь к каталогу размещения отчетов - результатов анализа.
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то файлы отчета будут сохранены в текущем каталоге запуска.
- *  -w, (--workspaceDir) &lt;arg&gt; -  Путь к каталогу проекта относительно котого указыватся пути к исходным файлам.
- *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
- *                                то пути к исходным файлам будут показыватья относительно текущего каталога запуска.
+ *  -w, (--workspaceDir) &lt;arg&gt; -  Путь к каталогу проекта, относительно которого располагаются исходные файлы.
+ *                                Возможно указывать как в абсолютном, так и в относительном виде. Если параметр опущен,
+ *                                то пути к исходным файлам будут указываться относительно текущего каталога запуска.
  *  -c, (--configuration) &lt;arg&gt; - Путь к конфигурационному файлу BSL Language Server (.bsl-language-server.json).
  *                                Возможно указывать как в абсолютном, так и относительном виде. Если параметр опущен,
  *                                то будут использованы настройки по умолчанию.

From d97c2220517251a29f186f9eb37b0397270f64c1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sun, 26 Apr 2020 13:57:03 +0300
Subject: [PATCH 156/444] Fix QF

---
 .../DeprecatedAttributes8312Diagnostic.java   | 261 +++++++++---------
 1 file changed, 136 insertions(+), 125 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
index cba975748e0..c4447a11954 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
@@ -34,6 +34,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.regex.Matcher;
@@ -112,150 +113,80 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
   private static final String CLEAR_EVENT_LOG_RU = "ОчиститьЖурналРегистрации";
 
   private static final HashMap<String, String> NEW_ATTRIBUTES_AND_METHODS = new HashMap<>();
+
   static {
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_RU.toLowerCase(), "ОтображатьШкалы");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_EN.toLowerCase(), "ShowScales");
-    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_LINES_RU.toLowerCase(), "ЛинииШкал");
-    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_COLOR_RU.toLowerCase(), "ЦветШкал");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_RU.toLowerCase(Locale.ENGLISH), "ОтображатьШкалы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_EN.toLowerCase(Locale.ENGLISH), "ShowScales");
+    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_LINES_RU.toLowerCase(Locale.ENGLISH), "ЛинииШкал");
+    NEW_ATTRIBUTES_AND_METHODS.put(SCALE_COLOR_RU.toLowerCase(Locale.ENGLISH), "ЦветШкал");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаСерий.ПоложениеПодписейШкалы");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SERIES_SCALE_LABELS_EN.toLowerCase(Locale.ENGLISH),
       "SeriesScale.ScaleLabelLocation");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаТочек.ПоложениеПодписейШкалы");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_POINTS_SCALE_LABELS_EN.toLowerCase(Locale.ENGLISH),
       "PointsScale.ScaleLabelLocation");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаЗначений.ПоложениеПодписейШкалы");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_VALUES_SCALE_LABELS_EN.toLowerCase(Locale.ENGLISH),
       "ValuesScale.ScaleLabelLocation");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаЗначений.ОтображениеЛинийСетки");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_SCALE_VALUE_LINES_EN.toLowerCase(Locale.ENGLISH),
       "ValuesScale.GridLinesShowMode");
-    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаЗначений.ФорматПодписей");
-    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(VALUE_SCALE_FORMAT_EN.toLowerCase(Locale.ENGLISH),
       "ValuesScale.LabelFormat");
-    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_RU.toLowerCase(Locale.ENGLISH),
       "ШкалаТочек.ОриентацияПодписей");
-    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(LABELS_ORIENTATION_EN.toLowerCase(Locale.ENGLISH),
       "PointsScale.LabelOrientation");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_RU.toLowerCase(Locale.ENGLISH),
       "одно из свойств ОбластьЛегендыДиаграммы, " +
-      "ОбластьЛегендыДиаграммыГанта или ОбластьЛегендыСводнойДиаграммы");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_EN.toLowerCase(),
+        "ОбластьЛегендыДиаграммыГанта или ОбластьЛегендыСводнойДиаграммы");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_LEGEND_EN.toLowerCase(Locale.ENGLISH),
       "one of the properties of ChartLegendArea, " +
-      "GanttChartLegendArea or PivotChartLegendArea");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_EN.toLowerCase(),
+        "GanttChartLegendArea or PivotChartLegendArea");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_EN.toLowerCase(Locale.ENGLISH),
       "one of the properties of ChartTitleArea, " +
-      "GanttChartTitleArea or PivotChartTitleArea");
-    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_RU.toLowerCase(),
+        "GanttChartTitleArea or PivotChartTitleArea");
+    NEW_ATTRIBUTES_AND_METHODS.put(SHOW_TITLE_RU.toLowerCase(Locale.ENGLISH),
       "одно из свойств ОбластьЗаголовкаДиаграммы, " +
-      "ОбластьЗаголовкаДиаграммыГанта или ОбластьЗаголовкаСводнойДиаграммы");
-    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_EN.toLowerCase(),
+        "ОбластьЗаголовкаДиаграммыГанта или ОбластьЗаголовкаСводнойДиаграммы");
+    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.ColorPalette");
-    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(COLOR_PALETTE_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.ПалитраЦветов");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.GradientPaletteStartColor");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_START_COLOR_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.ЦветНачалаГрадиентнойПалитры");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.GradientPaletteEndColor");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_END_COLOR_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.ЦветКонцаГрадиентнойПалитры");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.GradientPaletteMaxColors");
-    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GRADIENT_PALETTE_MAX_COLORS_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.МаксимальноеКоличествоЦветовГрадиентнойПалитры");
-    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.GetPalette");
-    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(GET_PALETTE_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.ПолучитьПалитру");
-    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_EN.toLowerCase(Locale.ENGLISH),
       "ColorPaletteDescription.SetPalette");
-    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(SET_PALETTE_RU.toLowerCase(Locale.ENGLISH),
       "ОписаниеПалитрыЦветов.УстановитьПалитру");
-    NEW_ATTRIBUTES_AND_METHODS.put(CHART_LABELS_ORIENTATION_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(CHART_LABELS_ORIENTATION_RU.toLowerCase(Locale.ENGLISH),
       "ОриентацияПодписейДиаграммы");
-    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN.toLowerCase(Locale.ENGLISH),
       "AlwaysHorizontal");
-    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU.toLowerCase(),
+    NEW_ATTRIBUTES_AND_METHODS.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU.toLowerCase(Locale.ENGLISH),
       "ГоризонтальнаяВсегда");
   }
 
-  private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
-    HashMap<String, String> attributesPair = new HashMap<>();
-    if (metaobject.equals(Metaobject.CHART_PLOT_AREA)) {
-      attributesPair.put(SHOW_SCALE_RU, SHOW_SCALE_EN);
-      attributesPair.put(SCALE_LINES_RU, "");
-      attributesPair.put(SCALE_COLOR_RU, "");
-      attributesPair.put(SHOW_SERIES_SCALE_LABELS_RU, SHOW_SERIES_SCALE_LABELS_EN);
-      attributesPair.put(SHOW_POINTS_SCALE_LABELS_RU, SHOW_POINTS_SCALE_LABELS_EN);
-      attributesPair.put(SHOW_VALUES_SCALE_LABELS_RU, SHOW_VALUES_SCALE_LABELS_EN);
-      attributesPair.put(SHOW_SCALE_VALUE_LINES_RU, SHOW_SCALE_VALUE_LINES_EN);
-      attributesPair.put(VALUE_SCALE_FORMAT_RU, VALUE_SCALE_FORMAT_EN);
-      attributesPair.put(LABELS_ORIENTATION_RU, LABELS_ORIENTATION_EN);
-    } else if (metaobject.equals(Metaobject.CHART)) {
-      attributesPair.put(SHOW_LEGEND_EN, SHOW_LEGEND_RU);
-      attributesPair.put(SHOW_TITLE_EN, SHOW_TITLE_RU);
-      attributesPair.put(COLOR_PALETTE_EN, COLOR_PALETTE_RU);
-      attributesPair.put(GRADIENT_PALETTE_START_COLOR_EN, GRADIENT_PALETTE_START_COLOR_RU);
-      attributesPair.put(GRADIENT_PALETTE_END_COLOR_EN, GRADIENT_PALETTE_END_COLOR_RU);
-      attributesPair.put(GRADIENT_PALETTE_MAX_COLORS_EN, GRADIENT_PALETTE_MAX_COLORS_RU);
-    } else if (metaobject.equals(Metaobject.ENUM_ITEMS_GROUP)) {
-      attributesPair.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN, CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU);
-    }
-    StringJoiner regex = new StringJoiner("|");
-
-    attributesPair.forEach((k, v) -> {
-      regex.add(k);
-      regex.add(v);
-    });
-
-    return regex.toString();
-  }
-
-  private static String getDeprecatedMethodsRegex(Metaobject metaobject) {
-    HashMap<String, String> attributesPair = new HashMap<>();
-
-    if (metaobject.equals(Metaobject.CHART)) {
-      attributesPair.put(GET_PALETTE_EN, GET_PALETTE_RU);
-      attributesPair.put(SET_PALETTE_EN, SET_PALETTE_RU);
-    }
-
-    StringJoiner regex = new StringJoiner("|");
-
-    attributesPair.forEach((k, v) -> {
-      regex.add(k);
-      regex.add(v);
-    });
-
-    return regex.toString();
-  }
-
-  private static String getMetaobjectNameRegex(Metaobject metaobject) {
-    HashMap<String, String> namePair = new HashMap<>();
-    if (metaobject.equals(Metaobject.CHART_PLOT_AREA)) {
-      namePair.put(CHART_PLOT_AREA_RU, CHART_PLOT_AREA_EN);
-    } else if (metaobject.equals(Metaobject.CHART)) {
-      namePair.put(CHART_RU, CHART_EN);
-      namePair.put(GANTT_CHART_EN, GANTT_CHART_RU);
-      namePair.put(PIVOT_CHART_EN, PIVOT_CHART_RU);
-    } else if (metaobject.equals(Metaobject.ENUM_ITEMS_GROUP)) {
-      namePair.put(CHILD_FORM_ITEMS_GROUP_EN, CHILD_FORM_ITEMS_GROUP_RU);
-    }
-    StringJoiner regex = new StringJoiner("|");
-
-    namePair.forEach((k, v) -> {
-      regex.add(k);
-      regex.add(v);
-    });
-
-    return regex.toString();
-  }
-
   private static final Pattern CHART_PLOT_AREA_ATTRIBUTES_PATTERN = Pattern.compile(
     getDeprecatedAttributesRegex(Metaobject.CHART_PLOT_AREA),
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
@@ -292,7 +223,6 @@ private static String getMetaobjectNameRegex(Metaobject metaobject) {
     CLEAR_EVENT_LOG_EN + "|" + CLEAR_EVENT_LOG_RU,
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-
   public DeprecatedAttributes8312Diagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -303,10 +233,12 @@ public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
     Matcher matcher = CHART_METHODS_PATTERN.matcher(ctx.methodName().getText());
     if (matcher.matches()) {
       String deprecatedMethod = matcher.group();
-      String message = String.format(info.getResourceString("deprecatedMethodsMessage"),
+      String message = info.getResourceString("deprecatedMethodsMessage",
         deprecatedMethod,
-        Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedMethod.toLowerCase()),
-          String::new));
+        Objects.requireNonNullElse(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedMethod.toLowerCase(Locale.ENGLISH)),
+          ""
+        )
+      );
       diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
 
@@ -318,8 +250,10 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     Matcher matcher = CLEAR_EVENT_LOG_PATTERN.matcher(ctx.methodName().getText());
     if (matcher.matches()) {
       String deprecatedMethod = ctx.getStart().getText();
-      String message = String.format(info.getResourceString("deprecatedGlobalMethodsMessage"),
-        deprecatedMethod);
+      String message = info.getResourceString(
+        "deprecatedGlobalMethodsMessage",
+        deprecatedMethod
+      );
       diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
     return super.visitGlobalMethodCall(ctx);
@@ -343,10 +277,13 @@ public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx)
     Matcher matcher = CHART_LABELS_ORIENTATION_PATTERN.matcher(ctx.getStart().getText());
     if (matcher.matches()) {
       String deprecatedEnum = ctx.getStart().getText();
-      String message = String.format(info.getResourceString("deprecatedEnumNameMessage"),
+      String message = info.getResourceString("deprecatedEnumNameMessage",
         deprecatedEnum,
-        Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedEnum.toLowerCase()),
-          String::new));
+        Objects.requireNonNullElse(
+          NEW_ATTRIBUTES_AND_METHODS.get(deprecatedEnum.toLowerCase(Locale.ENGLISH)),
+          ""
+        )
+      );
       diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
     }
 
@@ -354,8 +291,8 @@ public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx)
   }
 
   private void checkDeprecatedAttributes(BSLParserRuleContext ctx,
-                                            Pattern objectNamePattern,
-                                            Pattern deprecatedAttributesPattern) {
+                                         Pattern objectNamePattern,
+                                         Pattern deprecatedAttributesPattern) {
 
     Matcher deprecatedAttributesMatcher = deprecatedAttributesPattern.matcher(ctx.getText().substring(1));
 
@@ -369,10 +306,13 @@ private void checkDeprecatedAttributes(BSLParserRuleContext ctx,
       }
       if (objectNamePattern.matcher(complexCtx.getStart().getText()).matches()) {
         String deprecatedAttribute = deprecatedAttributesMatcher.group();
-        String message = String.format(info.getResourceString("deprecatedAttributeMessage"),
+        String message = info.getResourceString("deprecatedAttributeMessage",
           deprecatedAttribute,
-          Objects.requireNonNullElseGet(NEW_ATTRIBUTES_AND_METHODS.get(deprecatedAttribute.toLowerCase()),
-            String::new));
+          Objects.requireNonNullElse(
+            NEW_ATTRIBUTES_AND_METHODS.get(deprecatedAttribute.toLowerCase(Locale.ENGLISH)),
+            ""
+          )
+        );
 
         diagnosticStorage.addDiagnostic(ctx, info.getMessage(message));
       }
@@ -380,7 +320,78 @@ private void checkDeprecatedAttributes(BSLParserRuleContext ctx,
     }
   }
 
-  private enum Metaobject{
+  private static String getDeprecatedAttributesRegex(Metaobject metaobject) {
+    HashMap<String, String> attributesPair = new HashMap<>();
+    if (metaobject == Metaobject.CHART_PLOT_AREA) {
+      attributesPair.put(SHOW_SCALE_RU, SHOW_SCALE_EN);
+      attributesPair.put(SCALE_LINES_RU, "");
+      attributesPair.put(SCALE_COLOR_RU, "");
+      attributesPair.put(SHOW_SERIES_SCALE_LABELS_RU, SHOW_SERIES_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_POINTS_SCALE_LABELS_RU, SHOW_POINTS_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_VALUES_SCALE_LABELS_RU, SHOW_VALUES_SCALE_LABELS_EN);
+      attributesPair.put(SHOW_SCALE_VALUE_LINES_RU, SHOW_SCALE_VALUE_LINES_EN);
+      attributesPair.put(VALUE_SCALE_FORMAT_RU, VALUE_SCALE_FORMAT_EN);
+      attributesPair.put(LABELS_ORIENTATION_RU, LABELS_ORIENTATION_EN);
+    } else if (metaobject == Metaobject.CHART) {
+      attributesPair.put(SHOW_LEGEND_EN, SHOW_LEGEND_RU);
+      attributesPair.put(SHOW_TITLE_EN, SHOW_TITLE_RU);
+      attributesPair.put(COLOR_PALETTE_EN, COLOR_PALETTE_RU);
+      attributesPair.put(GRADIENT_PALETTE_START_COLOR_EN, GRADIENT_PALETTE_START_COLOR_RU);
+      attributesPair.put(GRADIENT_PALETTE_END_COLOR_EN, GRADIENT_PALETTE_END_COLOR_RU);
+      attributesPair.put(GRADIENT_PALETTE_MAX_COLORS_EN, GRADIENT_PALETTE_MAX_COLORS_RU);
+    } else if (metaobject == Metaobject.ENUM_ITEMS_GROUP) {
+      attributesPair.put(CHILD_FORM_ITEMS_GROUP_HORIZONTAL_EN, CHILD_FORM_ITEMS_GROUP_HORIZONTAL_RU);
+    }
+    StringJoiner regex = new StringJoiner("|");
+
+    attributesPair.forEach((String k, String v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private static String getDeprecatedMethodsRegex(Metaobject metaobject) {
+    HashMap<String, String> attributesPair = new HashMap<>();
+
+    if (metaobject == Metaobject.CHART) {
+      attributesPair.put(GET_PALETTE_EN, GET_PALETTE_RU);
+      attributesPair.put(SET_PALETTE_EN, SET_PALETTE_RU);
+    }
+
+    StringJoiner regex = new StringJoiner("|");
+
+    attributesPair.forEach((String k, String v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private static String getMetaobjectNameRegex(Metaobject metaobject) {
+    HashMap<String, String> namePair = new HashMap<>();
+    if (metaobject == Metaobject.CHART_PLOT_AREA) {
+      namePair.put(CHART_PLOT_AREA_RU, CHART_PLOT_AREA_EN);
+    } else if (metaobject == Metaobject.CHART) {
+      namePair.put(CHART_RU, CHART_EN);
+      namePair.put(GANTT_CHART_EN, GANTT_CHART_RU);
+      namePair.put(PIVOT_CHART_EN, PIVOT_CHART_RU);
+    } else if (metaobject == Metaobject.ENUM_ITEMS_GROUP) {
+      namePair.put(CHILD_FORM_ITEMS_GROUP_EN, CHILD_FORM_ITEMS_GROUP_RU);
+    }
+    StringJoiner regex = new StringJoiner("|");
+
+    namePair.forEach((String k, String v) -> {
+      regex.add(k);
+      regex.add(v);
+    });
+
+    return regex.toString();
+  }
+
+  private enum Metaobject {
     CHART,
     CHART_PLOT_AREA,
     ENUM_ITEMS_GROUP

From 52da61470e6d024357b4cd274150456fc68b63cf Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 18:40:34 +0700
Subject: [PATCH 157/444] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=B2=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D1=85=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=85=20(=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20Null=20=D0=B8=20NULL)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java  | 5 ++++-
 .../diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index ba0f48586e9..4f8b6f6e7a6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -97,7 +97,10 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
   private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
-    var set = expressions.stream().map(BSLParser.ExpressionContext::getText).collect(Collectors.toSet());
+    var set = expressions.stream()
+      .map(BSLParser.ExpressionContext::getText)
+      .map(String::toUpperCase)
+      .collect(Collectors.toSet());
     if (set.size() == 1) {
       var relatedInformation = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 67f0824d2ea..b6d68404a02 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -53,10 +53,10 @@
 Функция Подключаемый_КакаяТоКоманда(Команда)
 
     Если ЗначениеЗаполнено(ТекущаяДата) Тогда
-        Возврат Неопределено;
+        Возврат Null;
     КонецЕсли;
 
-    Возврат Неопределено;
+    Возврат NULL;
 
 КонецФункции
 

From 5b7f0e428bbc5d25d5a739b392954473f530efea Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Sun, 26 Apr 2020 15:02:15 +0300
Subject: [PATCH 158/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=8F=D0=B2=D0=BD=D0=BE=D0=B5=20=D1=83?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=B9=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B5=20toLowerCase()=20=D0=9F=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BD=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=20=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BD=D0=BE=20Code=20Conventions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedMethods8310Diagnostic.java      | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
index f31c37eca7f..004d9b14d6e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -32,6 +32,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -66,31 +67,35 @@ public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   private static final HashMap<String, String> newMethods = new HashMap<>();
+
+  public DeprecatedMethods8310Diagnostic(DiagnosticInfo info) {
+    super(info);
+  }
   static {
-    newMethods.put(SET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(),
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.УстановитьКраткийЗаголовок");
-    newMethods.put(GET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(),
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.ПолучитьКраткийЗаголовок");
-    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(),
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.УстановитьЗаголовок");
-    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(),
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.ПолучитьЗаголовок");
-    newMethods.put(BASE_FONT_CURRENT_VARIANT_RU.toLowerCase(),
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.ТекущийВариантОсновногоШрифта");
-    newMethods.put(CLIENT_INTERFACE_VARIANT_RU.toLowerCase(),
+    newMethods.put(CLIENT_INTERFACE_VARIANT_RU.toLowerCase(Locale.ENGLISH),
       "КлиентскоеПриложение.ТекущийВариантИнтерфейса");
 
-    newMethods.put(SET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(),
+    newMethods.put(SET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.SetShortCaption");
-    newMethods.put(GET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(),
+    newMethods.put(GET_SHORT_APPLICATION_CAPTION_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.GetShortCaption");
-    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(),
+    newMethods.put(SET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.SetCaption");
-    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(),
+    newMethods.put(GET_CLIENT_APPLICATION_CAPTION_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.GetCaption");
-    newMethods.put(BASE_FONT_CURRENT_VARIANT_EN.toLowerCase(),
+    newMethods.put(BASE_FONT_CURRENT_VARIANT_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.CurrentBaseFontVariant");
-    newMethods.put(CLIENT_INTERFACE_VARIANT_EN.toLowerCase(),
+    newMethods.put(CLIENT_INTERFACE_VARIANT_EN.toLowerCase(Locale.ENGLISH),
       "ClientApplication.CurrentInterfaceVariant");
   }
 
@@ -104,7 +109,7 @@ private static String getRegex() {
     methodsPair.put(CLIENT_INTERFACE_VARIANT_RU, CLIENT_INTERFACE_VARIANT_EN);
     StringJoiner regex = new StringJoiner("|");
 
-    methodsPair.forEach((k, v) -> {
+    methodsPair.forEach((String k, String v) -> {
       regex.add(k);
       regex.add(v);
     });
@@ -112,17 +117,13 @@ private static String getRegex() {
     return regex.toString();
   }
 
-  public DeprecatedMethods8310Diagnostic(DiagnosticInfo info) {
-    super(info);
-  }
-
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
     Matcher matcher = METHOD_PATTERN.matcher(ctx.methodName().getText());
     if (matcher.matches()) {
       diagnosticStorage.addDiagnostic(ctx,
-        info.getMessage(matcher.group(), newMethods.getOrDefault(matcher.group().toLowerCase(), "")));
+        info.getMessage(matcher.group(), newMethods.getOrDefault(matcher.group().toLowerCase(Locale.ENGLISH), "")));
     }
 
     return super.visitGlobalMethodCall(ctx);

From b02973bae3543c65cf0a5805e3095d39aa77d721 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 21:41:13 +0700
Subject: [PATCH 159/444] =?UTF-8?q?=D0=9D=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=20=D0=A1=D1=82=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BA=20=D0=B2=D0=B5=D1=80=D1=85=D0=BD=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=83=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitiveDiagnostic.java    | 10 ++++++++--
 .../FunctionReturnsSamePrimitiveDiagnostic.bsl     | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 4f8b6f6e7a6..5176fc3fb2a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -37,6 +37,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -98,8 +99,13 @@ private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
     var set = expressions.stream()
-      .map(BSLParser.ExpressionContext::getText)
-      .map(String::toUpperCase)
+      .map((BSLParser.ExpressionContext expression) -> {
+        var text = expression.getText();
+        if (Trees.findAllRuleNodes(expression, BSLParser.RULE_string).isEmpty()) {
+          text = text.toUpperCase(Locale.ENGLISH);
+        }
+        return text;
+      })
       .collect(Collectors.toSet());
     if (set.size() == 1) {
       var relatedInformation = tree.stream()
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index b6d68404a02..046db69df92 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -69,3 +69,17 @@ Function Attachable_RandomAction(Command)
     Return Undefined;
 
 EndFunction
+
+// тут нет ошибки
+Функция ПроверкаРегистраДляСтрок()
+
+    Тип = 1;
+    Если Тип = 1 Тогда
+        Возврат "Значение";
+    ИначеЕсли Тип = 2 Тогда
+        Возврат "значение";
+    Иначе
+        Возврат "ЗНАЧЕНИЕ";
+    КонецЕсли;
+
+КонецФункции

From bc14bb63f3fd7ad805c4a8ba8d737ee3cfce90fd Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 17 Apr 2020 23:05:33 +0300
Subject: [PATCH 160/444] =?UTF-8?q?CommonModuleNameClientServerDiagnostic?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommonModuleNameClientServer.md           | 36 ++++++++++
 .../CommonModuleNameClientServer.md           | 36 ++++++++++
 .../context/DocumentContext.java              | 11 +++
 ...ommonModuleNameClientServerDiagnostic.java | 56 +++++++++++++++
 ...leNameClientServerDiagnostic_en.properties |  2 +
 ...leNameClientServerDiagnostic_ru.properties |  2 +
 ...nModuleNameClientServerDiagnosticTest.java | 71 +++++++++++++++++++
 7 files changed, 214 insertions(+)
 create mode 100644 docs/diagnostics/CommonModuleNameClientServer.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameClientServer.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java

diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
new file mode 100644
index 00000000000..6fcb1ecdbe5
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index 9a985ae7912..efc3d229d53 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -35,6 +35,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import com.github._1c_syntax.bsl.parser.Tokenizer;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.mdclasses.metadata.SupportConfiguration;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.SupportVariant;
@@ -51,6 +52,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
@@ -79,6 +81,7 @@ public class DocumentContext {
   private final Lazy<DiagnosticIgnoranceComputer.Data> diagnosticIgnoranceData
     = new Lazy<>(this::computeDiagnosticIgnorance, computeLock);
   private final Lazy<MetricStorage> metrics = new Lazy<>(this::computeMetrics, computeLock);
+  private final Lazy<Optional<MDObjectBase>> mdObject = new Lazy<>(this::computeMdObject, computeLock);
 
   public DocumentContext(URI uri, String content, ServerContext context) {
     this.uri = Absolute.uri(uri);
@@ -187,6 +190,10 @@ public Map<SupportConfiguration, SupportVariant> getSupportVariants() {
     return supportVariants.getOrCompute();
   }
 
+  public Optional<MDObjectBase> getMdObject() {
+    return mdObject.getOrCompute();
+  }
+
   public void rebuild(String content) {
     computeLock.lock();
     clear();
@@ -329,4 +336,8 @@ private DiagnosticIgnoranceComputer.Data computeDiagnosticIgnorance() {
     return diagnosticIgnoranceComputer.compute();
   }
 
+  private Optional<MDObjectBase> computeMdObject() {
+    return Optional.ofNullable(context.getConfiguration().getModulesByURI().get(getUri()));
+  }
+
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
new file mode 100644
index 00000000000..9e79aad28a1
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -0,0 +1,56 @@
+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.DiagnosticScope;
+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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.Optional;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 2,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameClientServerDiagnostic extends AbstractVisitorDiagnostic {
+  public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFile(BSLParser.FileContext ctx) {
+
+    Optional<MDObjectBase> commonModuleOptional = documentContext.getMdObject();
+
+    if (commonModuleOptional.isEmpty()
+      || !(commonModuleOptional.get() instanceof CommonModule)) {
+      return super.visitFile(ctx);
+    }
+
+    CommonModule commonModule = (CommonModule) commonModuleOptional.get();
+
+    if (commonModule.isServer()
+      && commonModule.isClientManagedApplication()
+      && !commonModule.getName().endsWith("КлиентСервер")) {
+      diagnosticStorage.addDiagnostic(ctx.getStart());
+    }
+
+    return super.visitFile(ctx);
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
new file mode 100644
index 00000000000..40188ca542c
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Сообщение>
+diagnosticName=<Имя диагностики>
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
new file mode 100644
index 00000000000..70c5e864c82
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -0,0 +1,71 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameClientServerDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameClientServerDiagnostic> {
+  CommonModuleNameClientServerDiagnosticTest() {
+    super(CommonModuleNameClientServerDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @SneakyThrows
+  @Test
+  void test() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    var serverContext = spy(new ServerContext(path));
+    var configuration = spy(serverContext.getConfiguration());
+
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    var documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+    when(documentContext.getServerContext()).thenReturn(serverContext);
+
+    when(serverContext.getConfiguration()).thenReturn(configuration);
+    var modules = spy(configuration.getModulesByURI());
+
+    when(configuration.getModulesByURI()).thenReturn(modules);
+
+    CommonModule myModule = (CommonModule) modules.get(documentContext.getUri());
+
+    var spymodule = spy(myModule);
+    when(spymodule.isServer()).thenReturn(Boolean.TRUE);
+    when(spymodule.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(modules.get(documentContext.getUri())).thenReturn(spymodule);
+
+
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+}

From ba37830972f040080aa6242215d4fa1c3f6f1953 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 09:54:34 +0300
Subject: [PATCH 161/444] =?UTF-8?q?=D1=83=D0=B7=D0=BE=D1=80=D1=8B=20=D0=B2?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...monModuleNameClientServerDiagnosticTest.java | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 70c5e864c82..9cef18a961b 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -3,14 +3,12 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
-import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -36,6 +34,7 @@ void test() {
     Path path = Absolute.path(PATH_TO_METADATA);
     var serverContext = spy(new ServerContext(path));
     var configuration = spy(serverContext.getConfiguration());
+    when(serverContext.getConfiguration()).thenReturn(configuration);
 
     Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
 
@@ -44,24 +43,20 @@ void test() {
       FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
       serverContext
     ));
-
     when(documentContext.getServerContext()).thenReturn(serverContext);
 
-    when(serverContext.getConfiguration()).thenReturn(configuration);
-    var modules = spy(configuration.getModulesByURI());
 
+    var modules = spy(configuration.getModulesByURI());
     when(configuration.getModulesByURI()).thenReturn(modules);
 
-    CommonModule myModule = (CommonModule) modules.get(documentContext.getUri());
+    var module = spy((CommonModule) modules.get(documentContext.getUri()));
 
-    var spymodule = spy(myModule);
-    when(spymodule.isServer()).thenReturn(Boolean.TRUE);
-    when(spymodule.isClientManagedApplication()).thenReturn(Boolean.TRUE);
-    when(modules.get(documentContext.getUri())).thenReturn(spymodule);
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
 
+    when(modules.get(documentContext.getUri())).thenReturn(module);
 
     List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
-
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
       .hasRange(0, 0, 0, 1);

From 5fc6de251d1d1a677ac82369162280be025d5871 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 16:03:33 +0300
Subject: [PATCH 162/444] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?=
 =?UTF-8?q?=D0=BB=D0=BE=D1=81=D1=8C=20=D0=B2=D1=81=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/DocumentContext.java              |  7 +---
 ...ommonModuleNameClientServerDiagnostic.java | 37 +++++++++----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index efc3d229d53..2836d421a62 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -81,7 +81,6 @@ public class DocumentContext {
   private final Lazy<DiagnosticIgnoranceComputer.Data> diagnosticIgnoranceData
     = new Lazy<>(this::computeDiagnosticIgnorance, computeLock);
   private final Lazy<MetricStorage> metrics = new Lazy<>(this::computeMetrics, computeLock);
-  private final Lazy<Optional<MDObjectBase>> mdObject = new Lazy<>(this::computeMdObject, computeLock);
 
   public DocumentContext(URI uri, String content, ServerContext context) {
     this.uri = Absolute.uri(uri);
@@ -191,7 +190,7 @@ public Map<SupportConfiguration, SupportVariant> getSupportVariants() {
   }
 
   public Optional<MDObjectBase> getMdObject() {
-    return mdObject.getOrCompute();
+    return Optional.ofNullable(getServerContext().getConfiguration().getModulesByURI().get(getUri()));
   }
 
   public void rebuild(String content) {
@@ -336,8 +335,4 @@ private DiagnosticIgnoranceComputer.Data computeDiagnosticIgnorance() {
     return diagnosticIgnoranceComputer.compute();
   }
 
-  private Optional<MDObjectBase> computeMdObject() {
-    return Optional.ofNullable(context.getConfiguration().getModulesByURI().get(getUri()));
-  }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 9e79aad28a1..36a48f3f7fa 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -1,18 +1,16 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
-import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
-import org.antlr.v4.runtime.tree.ParseTree;
 
-import java.util.Optional;
+import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -27,30 +25,31 @@
   }
 
 )
-public class CommonModuleNameClientServerDiagnostic extends AbstractVisitorDiagnostic {
+public class CommonModuleNameClientServerDiagnostic extends AbstractDiagnostic {
+
+  private static final Pattern pattern = Pattern.compile(
+    "(КлиентСервер$|ClientServer$)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
   public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
-  public ParseTree visitFile(BSLParser.FileContext ctx) {
-
-    Optional<MDObjectBase> commonModuleOptional = documentContext.getMdObject();
+  protected void check(DocumentContext documentContext) {
 
-    if (commonModuleOptional.isEmpty()
-      || !(commonModuleOptional.get() instanceof CommonModule)) {
-      return super.visitFile(ctx);
+    if (documentContext.getTokens().isEmpty()) {
+      return;
     }
 
-    CommonModule commonModule = (CommonModule) commonModuleOptional.get();
-
-    if (commonModule.isServer()
-      && commonModule.isClientManagedApplication()
-      && !commonModule.getName().endsWith("КлиентСервер")) {
-      diagnosticStorage.addDiagnostic(ctx.getStart());
-    }
+    documentContext.getMdObject()
+      .map(CommonModule.class::cast)
+      .filter(CommonModule::isServer)
+      .filter(CommonModule::isClientManagedApplication)
+      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
+      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
 
-    return super.visitFile(ctx);
   }
 
 }

From 5dbb27ed493451025f63e556e15525ebc7509a0b Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 17:07:11 +0300
Subject: [PATCH 163/444] =?UTF-8?q?test=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nModuleNameClientServerDiagnosticTest.java | 106 ++++++++++++++----
 1 file changed, 87 insertions(+), 19 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 9cef18a961b..c9d09a05922 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -13,12 +13,16 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Optional;
 
 import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 class CommonModuleNameClientServerDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameClientServerDiagnostic> {
+  private CommonModule module;
+  private DocumentContext documentContext;
+
   CommonModuleNameClientServerDiagnosticTest() {
     super(CommonModuleNameClientServerDiagnostic.class);
   }
@@ -27,40 +31,104 @@ class CommonModuleNameClientServerDiagnosticTest extends AbstractDiagnosticTest<
   private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
 
 
-  @SneakyThrows
   @Test
   void test() {
 
-    Path path = Absolute.path(PATH_TO_METADATA);
-    var serverContext = spy(new ServerContext(path));
-    var configuration = spy(serverContext.getConfiguration());
-    when(serverContext.getConfiguration()).thenReturn(configuration);
+    getDocumentContextFromFile();
 
-    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
 
-    var documentContext = spy(new DocumentContext(
-      testFile.toUri(),
-      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
-      serverContext
-    ));
-    when(documentContext.getServerContext()).thenReturn(serverContext);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
 
-    var modules = spy(configuration.getModulesByURI());
-    when(configuration.getModulesByURI()).thenReturn(modules);
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
 
-    var module = spy((CommonModule) modules.get(documentContext.getUri()));
+  }
 
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентСервер");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
 
-    when(modules.get(documentContext.getUri())).thenReturn(module);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
+    // when
     List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
-    assertThat(diagnostics).hasSize(1);
-    assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
 
   }
 
+  @Test
+  void testFalse() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентСервер");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testFalse2() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
 }

From 0a250d97a58923c1b7bf2f41759e15a70d7ef2a8 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 17:07:59 +0300
Subject: [PATCH 164/444] =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommonModuleNameClientServerDiagnostic_en.properties      | 4 ++--
 .../CommonModuleNameClientServerDiagnostic_ru.properties      | 4 ++--
 .../diagnostics/CommonModuleNameClientServerDiagnostic.bsl    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameClientServerDiagnostic.bsl

diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
index 66831715dfd..9a99c2b6d43 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Add postfix "ClientServer" to the common module name
+diagnosticName=Missed postfix "ClientServer"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
index 40188ca542c..22ffdcb4b4e 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=<Сообщение>
-diagnosticName=<Имя диагностики>
+diagnosticMessage=Добавьте постфикс "КлиентСервер" к имени общего модуля
+diagnosticName=Пропущен постфикс "КлиентСервер"
diff --git a/src/test/resources/diagnostics/CommonModuleNameClientServerDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameClientServerDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameClientServerDiagnostic.bsl
@@ -0,0 +1 @@
+

From 2a6cbe2ba211c5ec97ad9b8278817aa16c01766e Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 17:08:11 +0300
Subject: [PATCH 165/444] =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/CommonModuleNameClientServer.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
index 6fcb1ecdbe5..c1b48a96ecc 100644
--- a/docs/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -8,6 +8,17 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Для того чтобы избежать дублирования кода, рекомендуется создавать клиент-серверные общие модули с теми процедурами и функциями, содержание которых одинаково на сервере и на клиенте. Такие процедуры и функции размещаются в общих модулях с признаками:
+
+* Клиент (управляемое приложение)
+* Сервер (флажок Вызов сервера сброшен)
+* Клиент (обычное приложение)
+* Внешнее соединение
+
+Общие модули этого вида именуются с постфиксом "КлиентСервер" (англ. "ClientServer").
+
+Например: РаботаСФайламиКлиентСервер, ОбщегоНазначенияКлиентСервер, UsersClientServer
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
@@ -19,6 +30,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
+
 ## Сниппеты
 <!-- Блоки ниже заполняются автоматически, не трогать -->
 

From a13d9285cc499acd096dca8b80e0fb66916fc625 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 17:10:30 +0300
Subject: [PATCH 166/444] license add

---
 ...ommonModuleNameClientServerDiagnostic.java | 21 +++++++++++++++++++
 ...nModuleNameClientServerDiagnosticTest.java | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 36a48f3f7fa..3a65eed696d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index c9d09a05922..46192b744cb 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;

From 3b70c1b93f8492605e3b5557683639a303bc0afe Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 17:57:18 +0300
Subject: [PATCH 167/444] =?UTF-8?q?=D0=A0=D0=B5=D0=B3=D1=83=D0=BB=D1=8F?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=B8=20=D1=82=D0=B5=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommonModuleNameClientServerDiagnostic.java           | 8 +++++---
 .../CommonModuleNameClientServerDiagnosticTest.java       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 3a65eed696d..45a0d6e6c23 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -35,21 +35,23 @@
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
+  severity = DiagnosticSeverity.MAJOR,
   scope = DiagnosticScope.BSL,
   modules = {
     ModuleType.CommonModule
   },
   minutesToFix = 2,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.UNPREDICTABLE
   }
 
 )
 public class CommonModuleNameClientServerDiagnostic extends AbstractDiagnostic {
 
   private static final Pattern pattern = Pattern.compile(
-    "(КлиентСервер$|ClientServer$)",
+    "^.*клиентсервер|^.*clientserver",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
   );
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 46192b744cb..65b8d5f2cb0 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -80,7 +80,7 @@ void testNegative() {
     getDocumentContextFromFile();
 
     // given
-    when(module.getName()).thenReturn("ЧтоТоКлиентСервер");
+    when(module.getName()).thenReturn("ЧтоТоclientserver");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
 

From 2aea4e10a00633623c0769218d1b6ba28600e0e8 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 18:22:23 +0300
Subject: [PATCH 168/444] precommit

---
 .../CommonModuleNameClientServer.md            | 18 +++++++++---------
 .../CommonModuleNameClientServer.md            | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
index c1b48a96ecc..577cb955648 100644
--- a/docs/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -1,8 +1,8 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Пропущен постфикс "КлиентСервер" (CommonModuleNameClientServer)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `2` | `badpractice`<br/>`standard`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -33,17 +33,17 @@
 [Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameClientServer-off
+// BSLLS:CommonModuleNameClientServer-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"CommonModuleNameClientServer": false
+```
diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
index 4e7e0f78ada..df3a228f51d 100644
--- a/docs/en/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -1,8 +1,8 @@
-# <Diagnostic name>
+# Missed postfix "ClientServer" (CommonModuleNameClientServer)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `2` | `badpractice`<br/>`standard`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameClientServer-off
+// BSLLS:CommonModuleNameClientServer-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"CommonModuleNameClientServer": false
 ```

From cc0b0ec7e9963417e0de286981ecbd0ebb83bf4f Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 19:43:47 +0300
Subject: [PATCH 169/444] CommonModuleNameServerCallDiagnostic

---
 .../diagnostics/CommonModuleNameServerCall.md | 36 +++++++
 .../diagnostics/CommonModuleNameServerCall.md | 36 +++++++
 .../CommonModuleNameServerCallDiagnostic.java | 48 ++++++++++
 ...duleNameServerCallDiagnostic_en.properties |  2 +
 ...duleNameServerCallDiagnostic_ru.properties |  2 +
 ...monModuleNameServerCallDiagnosticTest.java | 96 +++++++++++++++++++
 .../CommonModuleNameServerCallDiagnostic.bsl  |  1 +
 7 files changed, 221 insertions(+)
 create mode 100644 docs/diagnostics/CommonModuleNameServerCall.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameServerCall.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameServerCallDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameServerCall.md b/docs/diagnostics/CommonModuleNameServerCall.md
new file mode 100644
index 00000000000..6fcb1ecdbe5
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameServerCall.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
new file mode 100644
index 00000000000..32c8ab65a60
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -0,0 +1,48 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameServerCallDiagnostic extends AbstractDiagnostic {
+  public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  private static final Pattern pattern = Pattern.compile(
+    "^.*вызовсервера|^.*servercall",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  @Override
+  protected void check(DocumentContext documentContext) {
+
+    if (documentContext.getTokens().isEmpty()) {
+      return;
+    }
+
+    documentContext.getMdObject()
+      .map(CommonModule.class::cast)
+      .filter(CommonModule::isServer)
+      .filter(CommonModule::isServerCall)
+      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
+      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
+
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
new file mode 100644
index 00000000000..40188ca542c
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Сообщение>
+diagnosticName=<Имя диагностики>
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
new file mode 100644
index 00000000000..5c07263d826
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -0,0 +1,96 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameServerCallDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameServerCallDiagnostic> {
+
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  CommonModuleNameServerCallDiagnosticTest() {
+    super(CommonModuleNameServerCallDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void TestNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоВызовСервера");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameServerCallDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameServerCallDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameServerCallDiagnostic.bsl
@@ -0,0 +1 @@
+

From 5ca7c57febb10902da5d6e26da14aa286a620536 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 22:13:32 +0300
Subject: [PATCH 170/444] abstract common module

---
 .../AbstractCommonModuleNameDiagnostic.java   | 32 ++++++++++++
 ...ommonModuleNameClientServerDiagnostic.java | 27 +++-------
 .../CommonModuleNameServerCallDiagnostic.java | 51 +++++++++++--------
 3 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
new file mode 100644
index 00000000000..d4d417f58ac
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -0,0 +1,32 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
+
+  Pattern pattern;
+
+  public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  protected void check(DocumentContext documentContext) {
+    if (documentContext.getTokens().isEmpty()) {
+      return;
+    }
+
+    documentContext.getMdObject()
+      .map(CommonModule.class::cast)
+      .filter(this::flagsCheck)
+      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
+      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
+  }
+
+  protected abstract boolean flagsCheck(CommonModule commonModule);
+
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 45a0d6e6c23..7f400be95f6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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.DiagnosticScope;
@@ -48,31 +47,19 @@
   }
 
 )
-public class CommonModuleNameClientServerDiagnostic extends AbstractDiagnostic {
+public class CommonModuleNameClientServerDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final Pattern pattern = Pattern.compile(
-    "^.*клиентсервер|^.*clientserver",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-  );
 
   public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
     super(info);
+    pattern = Pattern.compile(
+      "^.*клиентсервер|^.*clientserver",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
-
-    if (documentContext.getTokens().isEmpty()) {
-      return;
-    }
-
-    documentContext.getMdObject()
-      .map(CommonModule.class::cast)
-      .filter(CommonModule::isServer)
-      .filter(CommonModule::isClientManagedApplication)
-      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
-      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
-
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.isServer() && commonModule.isClientManagedApplication();
   }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
index 32c8ab65a60..38b5da120bd 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -1,6 +1,26 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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;
@@ -19,30 +39,19 @@
   }
 
 )
-public class CommonModuleNameServerCallDiagnostic extends AbstractDiagnostic {
+public class CommonModuleNameServerCallDiagnostic extends AbstractCommonModuleNameDiagnostic {
+
   public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
     super(info);
-  }
 
-  private static final Pattern pattern = Pattern.compile(
-    "^.*вызовсервера|^.*servercall",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-  );
+    pattern = Pattern.compile(
+      "^.*вызовсервера|^.*servercall",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+  }
 
   @Override
-  protected void check(DocumentContext documentContext) {
-
-    if (documentContext.getTokens().isEmpty()) {
-      return;
-    }
-
-    documentContext.getMdObject()
-      .map(CommonModule.class::cast)
-      .filter(CommonModule::isServer)
-      .filter(CommonModule::isServerCall)
-      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
-      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
-
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.isServer() && commonModule.isServerCall();
   }
-
 }

From 5279aaf1db75a7b4e2d6c42c4fe3b71f32d589aa Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 22:14:10 +0300
Subject: [PATCH 171/444] precommit

---
 .../diagnostics/CommonModuleNameServerCall.md | 18 ++++++++--------
 .../diagnostics/CommonModuleNameServerCall.md | 16 +++++++-------
 .../configuration/parameters-schema.json      | 10 +++++++++
 .../languageserver/configuration/schema.json  |  3 +++
 ...duleNameServerCallDiagnostic_en.properties |  4 ++--
 ...duleNameServerCallDiagnostic_ru.properties |  4 ++--
 ...monModuleNameServerCallDiagnosticTest.java | 21 +++++++++++++++++++
 7 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameServerCall.md b/docs/diagnostics/CommonModuleNameServerCall.md
index 6fcb1ecdbe5..cee74ccebff 100644
--- a/docs/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/diagnostics/CommonModuleNameServerCall.md
@@ -1,8 +1,8 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Пропущен постфикс "ВызовСервера" (CommonModuleNameServerCall)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameServerCall-off
+// BSLLS:CommonModuleNameServerCall-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"CommonModuleNameServerCall": false
+```
diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index 4e7e0f78ada..c0cdb13e6cd 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -1,8 +1,8 @@
-# <Diagnostic name>
+# Missed postfix "ServerCall" (CommonModuleNameServerCall)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameServerCall-off
+// BSLLS:CommonModuleNameServerCall-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"CommonModuleNameServerCall": false
 ```
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 a6dcbbd3085..ddbe4995680 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
@@ -106,6 +106,16 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleNameServerCall": {
+            "description": "Missed postfix \"ServerCall\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"ServerCall\"",
+            "$id": "#/definitions/CommonModuleNameServerCall"
+        },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
             "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 20141ed863e..17587c88bec 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
@@ -47,6 +47,9 @@
                 "CommonModuleAssign": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
+                "CommonModuleNameServerCall": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameServerCall"
+                },
                 "CompilationDirectiveLost": {
                     "$ref": "parameters-schema.json#/definitions/CompilationDirectiveLost"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
index 66831715dfd..d50bed3faf4 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Add postfix "ServerCall" to the common module name
+diagnosticName=Missed postfix "ServerCall"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
index 40188ca542c..102dccde8d9 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=<Сообщение>
-diagnosticName=<Имя диагностики>
+diagnosticMessage=Добавьте постфикс "ВызовСервера" к имени общего модуля
+diagnosticName=Пропущен постфикс "ВызовСервера"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
index 5c07263d826..72d87133481 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;

From 1346289815e0f7760ff8bce1cee225ed58f25938 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 22:44:47 +0300
Subject: [PATCH 172/444] CommonModuleNameClientDiagnstic

---
 docs/diagnostics/CommonModuleNameClient.md    |  36 +++++
 docs/en/diagnostics/CommonModuleNameClient.md |  36 +++++
 .../AbstractCommonModuleNameDiagnostic.java   |  21 +++
 .../CommonModuleNameClientDiagnostic.java     |  60 ++++++++
 ...onModuleNameClientDiagnostic_en.properties |   2 +
 ...onModuleNameClientDiagnostic_ru.properties |   2 +
 .../CommonModuleNameClientDiagnosticTest.java | 138 ++++++++++++++++++
 .../CommonModuleNameClientDiagnostic.bsl      |   1 +
 8 files changed, 296 insertions(+)
 create mode 100644 docs/diagnostics/CommonModuleNameClient.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameClient.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameClientDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameClient.md b/docs/diagnostics/CommonModuleNameClient.md
new file mode 100644
index 00000000000..950369d208c
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameClient.md
@@ -0,0 +1,36 @@
+# Пропущен постфикс "Клиент" (CommonModuleNameClient)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleNameClient-off
+// BSLLS:CommonModuleNameClient-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleNameClient": false
+```
diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
new file mode 100644
index 00000000000..8f06688fabc
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -0,0 +1,36 @@
+# Missed postfix "Client" (CommonModuleNameClient)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleNameClient-off
+// BSLLS:CommonModuleNameClient-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleNameClient": false
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index d4d417f58ac..4b0b7ec5b84 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
new file mode 100644
index 00000000000..320a1d39479
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -0,0 +1,60 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleNameClientDiagnostic(DiagnosticInfo info) {
+    super(info);
+    pattern = Pattern.compile(
+      "^.*клиент|^.*client",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return !commonModule.isGlobal()
+      && commonModule.isClientManagedApplication()
+      && !commonModule.isServerCall();
+  }
+
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_en.properties
new file mode 100644
index 00000000000..7055f617b87
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Add postfix "Client" to the common module name
+diagnosticName=Missed postfix "Client"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_ru.properties
new file mode 100644
index 00000000000..6a3923a4774
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Добавьте постфикс "Клиент" к имени общего модуля
+diagnosticName=Пропущен постфикс "Клиент"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
new file mode 100644
index 00000000000..c17a1e3bdca
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -0,0 +1,138 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameClientDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameClientDiagnostic> {
+  private DocumentContext documentContext;
+  private CommonModule module;
+
+  CommonModuleNameClientDiagnosticTest() {
+    super(CommonModuleNameClientDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоclient");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testGlobal() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоГлобальный");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameClientDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameClientDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameClientDiagnostic.bsl
@@ -0,0 +1 @@
+

From 1f3c710db7215babeaa58ae59ca6ca4598637199 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 22:57:46 +0300
Subject: [PATCH 173/444] CommonModuleNameGlobalDiagnostic

---
 docs/diagnostics/CommonModuleNameGlobal.md    |  36 +++++
 docs/en/diagnostics/CommonModuleNameGlobal.md |  36 +++++
 .../CommonModuleNameGlobalDiagnostic.java     |  55 ++++++++
 .../configuration/parameters-schema.json      |  10 ++
 .../languageserver/configuration/schema.json  |   3 +
 ...onModuleNameGlobalDiagnostic_en.properties |   2 +
 ...onModuleNameGlobalDiagnostic_ru.properties |   2 +
 .../CommonModuleNameGlobalDiagnosticTest.java | 132 ++++++++++++++++++
 .../CommonModuleNameGlobalDiagnostic.bsl      |   1 +
 9 files changed, 277 insertions(+)
 create mode 100644 docs/diagnostics/CommonModuleNameGlobal.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameGlobal.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameGlobalDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameGlobal.md b/docs/diagnostics/CommonModuleNameGlobal.md
new file mode 100644
index 00000000000..0905c595bb0
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameGlobal.md
@@ -0,0 +1,36 @@
+# Пропущен постфикс "Глобальный" (CommonModuleNameGlobal)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `2` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleNameGlobal-off
+// BSLLS:CommonModuleNameGlobal-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleNameGlobal": false
+```
diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
new file mode 100644
index 00000000000..b79370c1ce8
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -0,0 +1,36 @@
+# Missed postfix "Global" (CommonModuleNameGlobal)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `2` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleNameGlobal-off
+// BSLLS:CommonModuleNameGlobal-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleNameGlobal": false
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
new file mode 100644
index 00000000000..cb87ee74516
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
@@ -0,0 +1,55 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 2,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameGlobalDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleNameGlobalDiagnostic(DiagnosticInfo info) {
+    super(info);
+    pattern = Pattern.compile(
+      "^.*глобальный|^.*global",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.isGlobal();
+  }
+}
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 ddbe4995680..5bb900e5260 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
@@ -106,6 +106,16 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleNameGlobal": {
+            "description": "Missed postfix \"Global\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Global\"",
+            "$id": "#/definitions/CommonModuleNameGlobal"
+        },
         "CommonModuleNameServerCall": {
             "description": "Missed postfix \"ServerCall\"",
             "default": null,
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 17587c88bec..5b652c0c102 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
@@ -47,6 +47,9 @@
                 "CommonModuleAssign": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
+                "CommonModuleNameGlobal": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobal"
+                },
                 "CommonModuleNameServerCall": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameServerCall"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_en.properties
new file mode 100644
index 00000000000..d5523c2d58d
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Add postfix "Global" to the common module name
+diagnosticName=Missed postfix "Global"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_ru.properties
new file mode 100644
index 00000000000..d31f89caa8e
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Добавьте постфикс "Глобальный" к имени общего модуля
+diagnosticName=Пропущен постфикс "Глобальный"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
new file mode 100644
index 00000000000..43c3dcfdab7
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
@@ -0,0 +1,132 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameGlobalDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameGlobalDiagnostic> {
+  private DocumentContext documentContext;
+  private CommonModule module;
+
+  CommonModuleNameGlobalDiagnosticTest() {
+    super(CommonModuleNameGlobalDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоglobal");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testFalse() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентСервер");
+    when(module.isGlobal()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameGlobalDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameGlobalDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameGlobalDiagnostic.bsl
@@ -0,0 +1 @@
+

From f9fd96083924b6ff986fa82842009a730be89757 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 23:08:36 +0300
Subject: [PATCH 174/444] CommonModuleNameFullAccessDiagnostic

---
 .../diagnostics/CommonModuleNameFullAccess.md |  36 +++++
 docs/diagnostics/index.md                     |   2 +-
 .../diagnostics/CommonModuleNameFullAccess.md |  36 +++++
 .../CommonModuleNameFullAccessDiagnostic.java |  56 ++++++++
 .../configuration/parameters-schema.json      |  10 ++
 .../languageserver/configuration/schema.json  |   3 +
 ...duleNameFullAccessDiagnostic_en.properties |   2 +
 ...duleNameFullAccessDiagnostic_ru.properties |   2 +
 ...monModuleNameFullAccessDiagnosticTest.java | 133 ++++++++++++++++++
 .../CommonModuleNameFullAccessDiagnostic.bsl  |   1 +
 10 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 docs/diagnostics/CommonModuleNameFullAccess.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameFullAccess.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameFullAccessDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameFullAccess.md b/docs/diagnostics/CommonModuleNameFullAccess.md
new file mode 100644
index 00000000000..7c704e4417f
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameFullAccess.md
@@ -0,0 +1,36 @@
+# Пропущен постфикс "ПолныеПрава" (CommonModuleNameFullAccess)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleNameFullAccess-off
+// BSLLS:CommonModuleNameFullAccess-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleNameFullAccess": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 784ac601b59..cb2ffb16ed1 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -10,7 +10,7 @@
 
 Общее количество: **94**
 
-* Дефект кода: **59**
+* Дефект кода: **60**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
new file mode 100644
index 00000000000..ca6cffcb8f0
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -0,0 +1,36 @@
+# Missed postfix "FullAccess" (CommonModuleNameFullAccess)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleNameFullAccess-off
+// BSLLS:CommonModuleNameFullAccess-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleNameFullAccess": false
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
new file mode 100644
index 00000000000..c433fee6e58
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
@@ -0,0 +1,56 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameFullAccessDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleNameFullAccessDiagnostic(DiagnosticInfo info) {
+    super(info);
+
+    pattern = Pattern.compile(
+      "^.*полныеправа|^.*fullaccess",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.isPrivileged();
+  }
+}
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 5bb900e5260..7705686ef53 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
@@ -106,6 +106,16 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleNameFullAccess": {
+            "description": "Missed postfix \"FullAccess\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"FullAccess\"",
+            "$id": "#/definitions/CommonModuleNameFullAccess"
+        },
         "CommonModuleNameGlobal": {
             "description": "Missed postfix \"Global\"",
             "default": null,
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 5b652c0c102..6da332fac34 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
@@ -47,6 +47,9 @@
                 "CommonModuleAssign": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
+                "CommonModuleNameFullAccess": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameFullAccess"
+                },
                 "CommonModuleNameGlobal": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobal"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_en.properties
new file mode 100644
index 00000000000..b47ed7c26b1
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Add postfix "FullAccess" to the common module name
+diagnosticName=Missed postfix "FullAccess"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_ru.properties
new file mode 100644
index 00000000000..fe09f0f76f7
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Добавьте постфикс "ПолныеПрава" к имени общего модуля
+diagnosticName=Пропущен постфикс "ПолныеПрава"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
new file mode 100644
index 00000000000..00702ba0fd5
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
@@ -0,0 +1,133 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameFullAccessDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameFullAccessDiagnostic> {
+  private DocumentContext documentContext;
+  private CommonModule module;
+
+  CommonModuleNameFullAccessDiagnosticTest() {
+    super(CommonModuleNameFullAccessDiagnostic.class);
+  }
+
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isPrivileged()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоFullAccess");
+    when(module.isPrivileged()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testFalse() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентСервер");
+    when(module.isPrivileged()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameFullAccessDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameFullAccessDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameFullAccessDiagnostic.bsl
@@ -0,0 +1 @@
+

From 2958098074abd213efdc02f2bcc426db14a902a4 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sat, 18 Apr 2020 23:27:46 +0300
Subject: [PATCH 175/444] CommonModuleNameCashedDiagnostic

---
 docs/diagnostics/CommonModuleNameCached.md    |  36 ++++++
 docs/diagnostics/index.md                     |   2 +-
 docs/en/diagnostics/CommonModuleNameCached.md |  36 ++++++
 .../CommonModuleNameCachedDiagnostic.java     |  59 +++++++++
 ...onModuleNameCachedDiagnostic_en.properties |   2 +
 ...onModuleNameCachedDiagnostic_ru.properties |   2 +
 .../CommonModuleNameCachedDiagnosticTest.java | 115 ++++++++++++++++++
 .../CommonModuleNameCachedDiagnostic.bsl      |   1 +
 8 files changed, 252 insertions(+), 1 deletion(-)
 create mode 100644 docs/diagnostics/CommonModuleNameCached.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameCached.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameCachedDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameCached.md b/docs/diagnostics/CommonModuleNameCached.md
new file mode 100644
index 00000000000..2bbb3a06a74
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameCached.md
@@ -0,0 +1,36 @@
+# Пропущен постфикс "ПовтИсп" (CommonModuleNameCached)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleNameCached-off
+// BSLLS:CommonModuleNameCached-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleNameCached": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index cb2ffb16ed1..0a65db8f9a1 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -10,7 +10,7 @@
 
 Общее количество: **94**
 
-* Дефект кода: **60**
+* Дефект кода: **61**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
new file mode 100644
index 00000000000..b0eb59c7bed
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -0,0 +1,36 @@
+# Missed postfix "Cached" (CommonModuleNameCached)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleNameCached-off
+// BSLLS:CommonModuleNameCached-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleNameCached": false
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
new file mode 100644
index 00000000000..1b5b8d64d87
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
@@ -0,0 +1,59 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameCachedDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleNameCachedDiagnostic(DiagnosticInfo info) {
+    super(info);
+    pattern = Pattern.compile(
+      "^.*повтисп|^.*сached",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.getReturnValuesReuse() == ReturnValueReuse.DURING_REQUEST
+      || commonModule.getReturnValuesReuse() == ReturnValueReuse.DURING_SESSION;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_en.properties
new file mode 100644
index 00000000000..d8e489ec3b3
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Add postfix "Cached" to the common module name
+diagnosticName=Missed postfix "Cached"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_ru.properties
new file mode 100644
index 00000000000..312d3e4833e
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Добавьте постфикс "ПовтИсп" к имени общего модуля
+diagnosticName=Пропущен постфикс "ПовтИсп"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
new file mode 100644
index 00000000000..eee3b62e4f1
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
@@ -0,0 +1,115 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameCachedDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameCachedDiagnostic> {
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  CommonModuleNameCachedDiagnosticTest() {
+    super(CommonModuleNameCachedDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DURING_REQUEST);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоПовтИсп");
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DURING_REQUEST);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameCachedDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameCachedDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameCachedDiagnostic.bsl
@@ -0,0 +1 @@
+

From 85a0f9ba3148b0592c6f73d3bb726c78a34bfc46 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 00:06:50 +0300
Subject: [PATCH 176/444] CommonModuleGlobalClientDiagnostic

---
 .../CommonModuleNameGlobalClient.md           |  36 +++++
 .../CommonModuleNameGlobalClient.md           |  36 +++++
 ...ommonModuleNameGlobalClientDiagnostic.java |  55 +++++++
 ...leNameGlobalClientDiagnostic_en.properties |   2 +
 ...leNameGlobalClientDiagnostic_ru.properties |   2 +
 ...nModuleNameGlobalClientDiagnosticTest.java | 134 ++++++++++++++++++
 ...CommonModuleNameGlobalClientDiagnostic.bsl |   1 +
 7 files changed, 266 insertions(+)
 create mode 100644 docs/diagnostics/CommonModuleNameGlobalClient.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameGlobalClient.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameGlobalClientDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameGlobalClient.md b/docs/diagnostics/CommonModuleNameGlobalClient.md
new file mode 100644
index 00000000000..6fcb1ecdbe5
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameGlobalClient.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
new file mode 100644
index 00000000000..750328d5013
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -0,0 +1,55 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.ERROR
+  }
+
+)
+public class CommonModuleNameGlobalClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleNameGlobalClientDiagnostic(DiagnosticInfo info) {
+    super(info);
+    pattern = Pattern.compile(
+      "!?клиент|!?client",
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return commonModule.isGlobal() && commonModule.isClientManagedApplication();
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_en.properties
new file mode 100644
index 00000000000..2c9b9e3e1f0
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Remove postfix "Client"
+diagnosticName=Global module with postfix "Client"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_ru.properties
new file mode 100644
index 00000000000..314049182e2
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Удалите постфикс "Клиент" у глобального модуля
+diagnosticName=Глобальный модуль с постфиксом "Клиент"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
new file mode 100644
index 00000000000..4afd3b392ca
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -0,0 +1,134 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameGlobalClientDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameGlobalClientDiagnostic> {
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  CommonModuleNameGlobalClientDiagnosticTest() {
+    super(CommonModuleNameGlobalClientDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентГлобальный");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(0, 0, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоglobal");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testFalse() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоКлиентГлобальный");
+    when(module.isGlobal()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CommonModuleNameGlobalClientDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameGlobalClientDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameGlobalClientDiagnostic.bsl
@@ -0,0 +1 @@
+

From a4c9866724e012ba3d510d806c1c4a6ae8000a0b Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 00:13:05 +0300
Subject: [PATCH 177/444] test empty file

---
 .../CommonModuleNameCachedDiagnosticTest.java         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
index eee3b62e4f1..16f5f29188a 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
@@ -93,6 +93,17 @@ void testNegative() {
 
   }
 
+  @Test
+  void testEmptyFile() {
+
+    // when
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
   @SneakyThrows
   void getDocumentContextFromFile() {
 

From d54c5a72df2c04a175ae1c19797d9353e2eb5a7e Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 00:30:28 +0300
Subject: [PATCH 178/444] regexp fix

---
 .../diagnostics/CommonModuleNameGlobalClientDiagnostic.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
index 750328d5013..8cd5f2cd3b0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -43,7 +43,7 @@ public class CommonModuleNameGlobalClientDiagnostic extends AbstractCommonModule
   public CommonModuleNameGlobalClientDiagnostic(DiagnosticInfo info) {
     super(info);
     pattern = Pattern.compile(
-      "!?клиент|!?client",
+      "^(?>(?!Клиент|client).)*$",
       Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
     );
   }

From 8427d107835a78f5cba724057c4685fd56262574 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 00:31:45 +0300
Subject: [PATCH 179/444] precommit

---
 .../CommonModuleNameGlobalClient.md            | 18 +++++++++---------
 docs/diagnostics/index.md                      |  4 ++--
 .../CommonModuleNameGlobalClient.md            | 16 ++++++++--------
 docs/en/diagnostics/index.md                   |  2 +-
 .../configuration/parameters-schema.json       | 10 ++++++++++
 .../languageserver/configuration/schema.json   |  3 +++
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameGlobalClient.md b/docs/diagnostics/CommonModuleNameGlobalClient.md
index 6fcb1ecdbe5..d00e2263fca 100644
--- a/docs/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/diagnostics/CommonModuleNameGlobalClient.md
@@ -1,8 +1,8 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Глобальный модуль с постфиксом "Клиент" (CommonModuleNameGlobalClient)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameGlobalClient-off
+// BSLLS:CommonModuleNameGlobalClient-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"CommonModuleNameGlobalClient": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 0a65db8f9a1..3d83ffd03c8 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **94**
+Общее количество: **95**
 
-* Дефект кода: **61**
+* Дефект кода: **62**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index 4e7e0f78ada..f6d3069371c 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -1,8 +1,8 @@
-# <Diagnostic name>
+# Global module with postfix "Client" (CommonModuleNameGlobalClient)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -20,17 +20,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:CommonModuleNameGlobalClient-off
+// BSLLS:CommonModuleNameGlobalClient-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"CommonModuleNameGlobalClient": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 5088bbd207c..249cde8c4b7 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,7 +8,7 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **94**
+Total: **95**
 
 * Error: **31**
 * Code smell: **59**
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 7705686ef53..2e520d21339 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
@@ -126,6 +126,16 @@
             "title": "Missed postfix \"Global\"",
             "$id": "#/definitions/CommonModuleNameGlobal"
         },
+        "CommonModuleNameGlobalClient": {
+            "description": "Global module with postfix \"Client\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Global module with postfix \"Client\"",
+            "$id": "#/definitions/CommonModuleNameGlobalClient"
+        },
         "CommonModuleNameServerCall": {
             "description": "Missed postfix \"ServerCall\"",
             "default": null,
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 6da332fac34..d283d142a5b 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
@@ -53,6 +53,9 @@
                 "CommonModuleNameGlobal": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobal"
                 },
+                "CommonModuleNameGlobalClient": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobalClient"
+                },
                 "CommonModuleNameServerCall": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameServerCall"
                 },

From 3c66ea93ae264e6f9aaee7f9c198008935642bbc Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 09:17:58 +0300
Subject: [PATCH 180/444] =?UTF-8?q?patter=20=D0=B2=20super?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCommonModuleNameDiagnostic.java          | 10 ++++++++--
 .../CommonModuleNameCachedDiagnostic.java            | 12 ++++--------
 .../CommonModuleNameClientDiagnostic.java            | 12 ++++--------
 .../CommonModuleNameClientServerDiagnostic.java      |  9 ++-------
 .../CommonModuleNameFullAccessDiagnostic.java        | 12 ++++--------
 .../CommonModuleNameGlobalClientDiagnostic.java      | 11 ++++-------
 .../CommonModuleNameGlobalDiagnostic.java            | 11 ++++-------
 .../CommonModuleNameServerCallDiagnostic.java        | 11 +++--------
 8 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 4b0b7ec5b84..cdd27ce8fc9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -29,10 +29,16 @@
 
 abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
 
-  Pattern pattern;
+  private final Pattern pattern;
 
-  public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info) {
+  public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
     super(info);
+
+    pattern = Pattern.compile(
+      regexp,
+      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+    );
+
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
index 1b5b8d64d87..a16b2a88ff3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
@@ -29,8 +29,6 @@
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -41,13 +39,11 @@
 
 )
 public class CommonModuleNameCachedDiagnostic extends AbstractCommonModuleNameDiagnostic {
-  public CommonModuleNameCachedDiagnostic(DiagnosticInfo info) {
-    super(info);
-    pattern = Pattern.compile(
-      "^.*повтисп|^.*сached",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
 
+  private static final String REGEXP = "^.*повтисп|^.*сached";
+
+  public CommonModuleNameCachedDiagnostic(DiagnosticInfo info) {
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
index 320a1d39479..0f9951caabf 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -28,8 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -40,13 +38,11 @@
 
 )
 public class CommonModuleNameClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
-  public CommonModuleNameClientDiagnostic(DiagnosticInfo info) {
-    super(info);
-    pattern = Pattern.compile(
-      "^.*клиент|^.*client",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
 
+  private static final String REGEXP = "^.*клиент|^.*client";
+
+  public CommonModuleNameClientDiagnostic(DiagnosticInfo info) {
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 7f400be95f6..3c7add55a04 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -30,8 +30,6 @@
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.MAJOR,
@@ -49,13 +47,10 @@
 )
 public class CommonModuleNameClientServerDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
+  private static final String REGEXP = "^.*клиентсервер|^.*clientserver";
 
   public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
-    super(info);
-    pattern = Pattern.compile(
-      "^.*клиентсервер|^.*clientserver",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
index c433fee6e58..1b96b35483b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
@@ -28,8 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -40,13 +38,11 @@
 
 )
 public class CommonModuleNameFullAccessDiagnostic extends AbstractCommonModuleNameDiagnostic {
-  public CommonModuleNameFullAccessDiagnostic(DiagnosticInfo info) {
-    super(info);
 
-    pattern = Pattern.compile(
-      "^.*полныеправа|^.*fullaccess",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+  private static final String REGEXP = "^.*полныеправа|^.*fullaccess";
+
+  public CommonModuleNameFullAccessDiagnostic(DiagnosticInfo info) {
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
index 8cd5f2cd3b0..96fce574156 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -28,8 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -40,12 +38,11 @@
 
 )
 public class CommonModuleNameGlobalClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
+
+  private static final String REGEXP = "^(?>(?!Клиент|client).)*$";
+
   public CommonModuleNameGlobalClientDiagnostic(DiagnosticInfo info) {
-    super(info);
-    pattern = Pattern.compile(
-      "^(?>(?!Клиент|client).)*$",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
index cb87ee74516..ba8efed3d39 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
@@ -28,8 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -40,12 +38,11 @@
 
 )
 public class CommonModuleNameGlobalDiagnostic extends AbstractCommonModuleNameDiagnostic {
+
+  private static final String REGEXP = "^.*глобальный|^.*global";
+
   public CommonModuleNameGlobalDiagnostic(DiagnosticInfo info) {
-    super(info);
-    pattern = Pattern.compile(
-      "^.*глобальный|^.*global",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+    super(info, REGEXP);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
index 38b5da120bd..b4e33348e4f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -28,8 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 
-import java.util.regex.Pattern;
-
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
@@ -41,13 +39,10 @@
 )
 public class CommonModuleNameServerCallDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
-    super(info);
+  private static final String REGEXP = "^.*вызовсервера|^.*servercall";
 
-    pattern = Pattern.compile(
-      "^.*вызовсервера|^.*servercall",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+  public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
+    super(info, REGEXP);
   }
 
   @Override

From f0a71a1eaa649c15d8c26db6e49d32dd9af4c974 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 09:37:26 +0300
Subject: [PATCH 181/444] Metadata

---
 .../CommonModuleNameCachedDiagnostic.java      | 15 +++++++++++----
 .../CommonModuleNameClientDiagnostic.java      | 16 ++++++++++++----
 ...CommonModuleNameClientServerDiagnostic.java |  5 ++---
 .../CommonModuleNameFullAccessDiagnostic.java  | 18 +++++++++++++-----
 ...CommonModuleNameGlobalClientDiagnostic.java | 13 +++++++++----
 .../CommonModuleNameGlobalDiagnostic.java      | 16 ++++++++++++----
 .../CommonModuleNameServerCallDiagnostic.java  | 15 +++++++++++----
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
index a16b2a88ff3..3504fe46350 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
@@ -23,20 +23,27 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE
   }
-
 )
 public class CommonModuleNameCachedDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
index 0f9951caabf..73322a59bd3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -23,19 +23,27 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MINOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE,
+    DiagnosticTag.BRAINOVERLOAD
   }
-
 )
 public class CommonModuleNameClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 3c7add55a04..ca21c1e0c0a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -37,13 +37,12 @@
   modules = {
     ModuleType.CommonModule
   },
-  minutesToFix = 2,
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.BADPRACTICE,
     DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
     DiagnosticTag.UNPREDICTABLE
   }
-
 )
 public class CommonModuleNameClientServerDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
index 1b96b35483b..7166efc6b02 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
@@ -23,19 +23,27 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 @DiagnosticMetadata(
-  type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  type = DiagnosticType.SECURITY_HOTSPOT,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE,
+    DiagnosticTag.SUSPICIOUS
   }
-
 )
 public class CommonModuleNameFullAccessDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
index 96fce574156..72a210f2f81 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -23,19 +23,24 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.ERROR
+    DiagnosticTag.STANDARD
   }
-
 )
 public class CommonModuleNameGlobalClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
index ba8efed3d39..25e7cd03705 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
@@ -23,19 +23,27 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 2,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE,
+    DiagnosticTag.BRAINOVERLOAD
   }
-
 )
 public class CommonModuleNameGlobalDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
index b4e33348e4f..433a83469f7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -23,19 +23,26 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MINOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
   tags = {
-    DiagnosticTag.STANDARD
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.UNPREDICTABLE
   }
-
 )
 public class CommonModuleNameServerCallDiagnostic extends AbstractCommonModuleNameDiagnostic {
 

From 1376750a4daa7f36e4e9b3ade52d84820761ceed Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 10:46:25 +0300
Subject: [PATCH 182/444] docs

---
 docs/diagnostics/CommonModuleNameCached.md       |  8 ++++++++
 docs/diagnostics/CommonModuleNameClient.md       | 16 ++++++++++++++++
 docs/diagnostics/CommonModuleNameClientServer.md |  6 +++---
 docs/diagnostics/CommonModuleNameFullAccess.md   |  7 +++++++
 docs/diagnostics/CommonModuleNameGlobal.md       |  7 +++++++
 docs/diagnostics/CommonModuleNameGlobalClient.md | 12 ++++++++++++
 docs/diagnostics/CommonModuleNameServerCall.md   | 13 +++++++++++++
 7 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameCached.md b/docs/diagnostics/CommonModuleNameCached.md
index 2bbb3a06a74..83ecf2b62dd 100644
--- a/docs/diagnostics/CommonModuleNameCached.md
+++ b/docs/diagnostics/CommonModuleNameCached.md
@@ -8,9 +8,15 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Модули, предназначенные для реализации на сервере или на клиенте функций с повторным использованием возвращаемых 
+значений (на время вызова или на время сеанса), именуются с постфиксом "ПовтИсп" (англ. "Cached") 
+и "КлиентПовтИсп" (англ. "ClientCached") соответственно.
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+РаботаСФайламиКлиентПовтИсп, UsersInternalCached
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +25,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.3)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/CommonModuleNameClient.md b/docs/diagnostics/CommonModuleNameClient.md
index 950369d208c..3d36702f8d8 100644
--- a/docs/diagnostics/CommonModuleNameClient.md
+++ b/docs/diagnostics/CommonModuleNameClient.md
@@ -8,9 +8,23 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Клиентские общие модули содержат клиентскую бизнес-логику (функциональность, определенную только для клиента)
+ и имеют признаки:
+
+* Клиент (управляемое приложение)
+* Клиент (обычное приложение)
+
+Исключение составляют случаи, когда клиентские процедуры и функции должны быть доступны только в режиме управляемого 
+приложения (только в режиме обычного приложения или только в режиме внешнего соединения). 
+В таких случаях, допустима иная комбинация двух этих признаков.
+
+Клиентские общие модули именуются с постфиксом "Клиент" (англ. "Client" ). Кроме случая - когда стоит флаг Глобальный.
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+РаботаСФайламиКлиент, ОбщегоНазначенияКлиент, StandardSubsystemsClient
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +33,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.3)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
index 577cb955648..e467f0f329d 100644
--- a/docs/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -17,11 +17,11 @@
 
 Общие модули этого вида именуются с постфиксом "КлиентСервер" (англ. "ClientServer").
 
-Например: РаботаСФайламиКлиентСервер, ОбщегоНазначенияКлиентСервер, UsersClientServer
-
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+РаботаСФайламиКлиентСервер, ОбщегоНазначенияКлиентСервер, UsersClientServer
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -30,7 +30,7 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
-[Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
+[Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
 
 ## Сниппеты
 
diff --git a/docs/diagnostics/CommonModuleNameFullAccess.md b/docs/diagnostics/CommonModuleNameFullAccess.md
index 7c704e4417f..7a1cc61276d 100644
--- a/docs/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/diagnostics/CommonModuleNameFullAccess.md
@@ -8,9 +8,14 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Модули, выполняющиеся в привилегированном режиме, имеющие признак Привилегированный, 
+именуются с постфиксом "ПолныеПрава" (англ. "FullAccess").
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+Например: РаботаСФайламиПолныеПрава, FilesFullAccess
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +24,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.2)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/CommonModuleNameGlobal.md b/docs/diagnostics/CommonModuleNameGlobal.md
index 0905c595bb0..5a0ea8bdbca 100644
--- a/docs/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/diagnostics/CommonModuleNameGlobal.md
@@ -8,9 +8,14 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"),
+ в этом случае постфикс "Клиент" добавлять не следует.
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+РаботаСФайламиГлобальный, InfobaseUpdateGlobal
+ 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +24,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.1)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/CommonModuleNameGlobalClient.md b/docs/diagnostics/CommonModuleNameGlobalClient.md
index d00e2263fca..e50847dae9a 100644
--- a/docs/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/diagnostics/CommonModuleNameGlobalClient.md
@@ -8,9 +8,18 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"), 
+в этом случае постфикс "Клиент" добавлять не следует.
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+НеПравильно: 
+РаботаСФайламиГлобальныйКлиент, InfobaseUpdateGlobalClient
+
+Правильно: 
+РаботаСФайламиГлобальный, InfobaseUpdateGlobal
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +28,9 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+
+[Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.1)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/CommonModuleNameServerCall.md b/docs/diagnostics/CommonModuleNameServerCall.md
index cee74ccebff..6e23d5c9812 100644
--- a/docs/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/diagnostics/CommonModuleNameServerCall.md
@@ -8,9 +8,20 @@
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Серверные общие модули для вызова с клиента содержат серверные процедуры и функции, доступные для использования 
+из клиентского кода. Они составляют клиентский программный интерфейс сервера приложения.
+Такие процедуры и функции размещаются в общих модулях с признаком:
+
+* Сервер (флажок Вызов сервера установлен)
+
+Серверные общие модули для вызова с клиента называются по общим правилам именования объектов метаданных
+и должны именоваться с постфиксом "ВызовСервера" (англ. "ServerCall").
+
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+РаботаСФайламиВызовСервера, CommonServerCall
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -19,6 +30,8 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
+[Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
+
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->

From 73635a7e3c67d28a68a8f39be2361923c1363223 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Sun, 19 Apr 2020 11:31:47 +0300
Subject: [PATCH 183/444] =?UTF-8?q?=D0=A1=D0=BB=D0=B8=D1=88=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=D1=82=D0=B5=D0=B3=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/CommonModuleNameClientDiagnostic.java          | 3 +--
 .../diagnostics/CommonModuleNameFullAccessDiagnostic.java      | 3 +--
 .../diagnostics/CommonModuleNameGlobalDiagnostic.java          | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
index 73322a59bd3..d8fa8a39f50 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -41,8 +41,7 @@
   tags = {
     DiagnosticTag.STANDARD,
     DiagnosticTag.BADPRACTICE,
-    DiagnosticTag.UNPREDICTABLE,
-    DiagnosticTag.BRAINOVERLOAD
+    DiagnosticTag.UNPREDICTABLE
   }
 )
 public class CommonModuleNameClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
index 7166efc6b02..0e97ba0d90f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
@@ -41,8 +41,7 @@
   tags = {
     DiagnosticTag.STANDARD,
     DiagnosticTag.BADPRACTICE,
-    DiagnosticTag.UNPREDICTABLE,
-    DiagnosticTag.SUSPICIOUS
+    DiagnosticTag.UNPREDICTABLE
   }
 )
 public class CommonModuleNameFullAccessDiagnostic extends AbstractCommonModuleNameDiagnostic {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
index 25e7cd03705..501cc8f47da 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
@@ -41,7 +41,6 @@
   tags = {
     DiagnosticTag.STANDARD,
     DiagnosticTag.BADPRACTICE,
-    DiagnosticTag.UNPREDICTABLE,
     DiagnosticTag.BRAINOVERLOAD
   }
 )

From 8cc345d1e3507b35b14f7c4496f6fee4a5fdb0c2 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 16:01:30 +0300
Subject: [PATCH 184/444] precommit

---
 docs/diagnostics/CommonModuleNameCached.md    |  2 +-
 docs/diagnostics/CommonModuleNameClient.md    |  2 +-
 .../CommonModuleNameClientServer.md           |  2 +-
 .../diagnostics/CommonModuleNameFullAccess.md |  2 +-
 docs/diagnostics/CommonModuleNameGlobal.md    |  2 +-
 .../CommonModuleNameGlobalClient.md           |  2 +-
 .../diagnostics/CommonModuleNameServerCall.md |  2 +-
 docs/diagnostics/index.md                     | 11 +++++--
 docs/en/diagnostics/CommonModuleNameCached.md |  2 +-
 docs/en/diagnostics/CommonModuleNameClient.md |  2 +-
 .../CommonModuleNameClientServer.md           |  2 +-
 .../diagnostics/CommonModuleNameFullAccess.md |  2 +-
 docs/en/diagnostics/CommonModuleNameGlobal.md |  2 +-
 .../CommonModuleNameGlobalClient.md           |  2 +-
 .../diagnostics/CommonModuleNameServerCall.md |  2 +-
 docs/en/diagnostics/index.md                  | 11 +++++--
 .../configuration/parameters-schema.json      | 30 +++++++++++++++++++
 .../languageserver/configuration/schema.json  |  9 ++++++
 18 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameCached.md b/docs/diagnostics/CommonModuleNameCached.md
index 83ecf2b62dd..1d8a065d602 100644
--- a/docs/diagnostics/CommonModuleNameCached.md
+++ b/docs/diagnostics/CommonModuleNameCached.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameClient.md b/docs/diagnostics/CommonModuleNameClient.md
index 3d36702f8d8..b191ae1bfb0 100644
--- a/docs/diagnostics/CommonModuleNameClient.md
+++ b/docs/diagnostics/CommonModuleNameClient.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+| `Дефект кода` | `BSL` | `Незначительный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
index e467f0f329d..7e0f02a37a4 100644
--- a/docs/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL` | `Важный` | `Да` | `2` | `badpractice`<br/>`standard`<br/>`unpredictable` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameFullAccess.md b/docs/diagnostics/CommonModuleNameFullAccess.md
index 7a1cc61276d..7db398c816b 100644
--- a/docs/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/diagnostics/CommonModuleNameFullAccess.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+| `Потенциальная уязвимость` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameGlobal.md b/docs/diagnostics/CommonModuleNameGlobal.md
index 5a0ea8bdbca..bfa956f7931 100644
--- a/docs/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/diagnostics/CommonModuleNameGlobal.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `2` | `standard` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`brainoverload` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameGlobalClient.md b/docs/diagnostics/CommonModuleNameGlobalClient.md
index e50847dae9a..406095c539e 100644
--- a/docs/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/diagnostics/CommonModuleNameGlobalClient.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `error` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/CommonModuleNameServerCall.md b/docs/diagnostics/CommonModuleNameServerCall.md
index 6e23d5c9812..9cbf5661dfa 100644
--- a/docs/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/diagnostics/CommonModuleNameServerCall.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+| `Дефект кода` | `BSL` | `Незначительный` | `Да` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 3d83ffd03c8..0af57c0bf58 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,12 +8,12 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **95**
+Общее количество: **98**
 
 * Дефект кода: **62**
 * Уязвимость: **2**
 * Ошибка: **31**
-* Потенциальная уязвимость: **2**
+* Потенциальная уязвимость: **3**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
 | --- | --- | :-: | --- | --- | --- |
@@ -25,6 +25,13 @@
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
+| [CommonModuleNameCached](CommonModuleNameCached.md) | Пропущен постфикс "ПовтИсп" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClient](CommonModuleNameClient.md) | Пропущен постфикс "Клиент" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Пропущен постфикс "КлиентСервер" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Пропущен постфикс "ПолныеПрава" | Да | Важный | Потенциальная уязвимость | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Пропущен постфикс "Глобальный" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`brainoverload` |
+| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Глобальный модуль с постфиксом "Клиент" | Да | Важный | Дефект кода | `standard` |
+| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Пропущен постфикс "ВызовСервера" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
index b0eb59c7bed..f68b7fcef4c 100644
--- a/docs/en/diagnostics/CommonModuleNameCached.md
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
index 8f06688fabc..384de32edbe 100644
--- a/docs/en/diagnostics/CommonModuleNameClient.md
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
index df3a228f51d..f7bd46df19a 100644
--- a/docs/en/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `2` | `badpractice`<br/>`standard`<br/>`unpredictable` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
index ca6cffcb8f0..017824cc80c 100644
--- a/docs/en/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+| `Security Hotspot` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
index b79370c1ce8..fe99c8d9d10 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `2` | `standard` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`brainoverload` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index f6d3069371c..6bbc7f913b8 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `error` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index c0cdb13e6cd..16edd513e53 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 249cde8c4b7..f910d750141 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: **95**
+Total: **98**
 
 * Error: **31**
 * Code smell: **59**
 * Vulnerability: **2**
-* Security Hotspot: **2**
+* Security Hotspot: **3**
 
 | Key | Name| Enabled by default | Severity | Type | Tags |
 | --- | --- | :-: | --- | --- | --- |
@@ -25,6 +25,13 @@ Total: **95**
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
+| [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
+| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
+| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
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 2e520d21339..d76007a2b66 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
@@ -106,6 +106,36 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleNameCached": {
+            "description": "Missed postfix \"Cached\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Cached\"",
+            "$id": "#/definitions/CommonModuleNameCached"
+        },
+        "CommonModuleNameClient": {
+            "description": "Missed postfix \"Client\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Client\"",
+            "$id": "#/definitions/CommonModuleNameClient"
+        },
+        "CommonModuleNameClientServer": {
+            "description": "Missed postfix \"ClientServer\"",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"ClientServer\"",
+            "$id": "#/definitions/CommonModuleNameClientServer"
+        },
         "CommonModuleNameFullAccess": {
             "description": "Missed postfix \"FullAccess\"",
             "default": null,
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 d283d142a5b..638c4586703 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
@@ -47,6 +47,15 @@
                 "CommonModuleAssign": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
+                "CommonModuleNameCached": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameCached"
+                },
+                "CommonModuleNameClient": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameClient"
+                },
+                "CommonModuleNameClientServer": {
+                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameClientServer"
+                },
                 "CommonModuleNameFullAccess": {
                     "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameFullAccess"
                 },

From 10c966a642cd36ca1895e04de6fb10a50df4e83c Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 16:18:41 +0300
Subject: [PATCH 185/444] matches -> find

---
 .../diagnostics/AbstractCommonModuleNameDiagnostic.java        | 3 ++-
 .../diagnostics/CommonModuleNameCachedDiagnostic.java          | 2 +-
 .../diagnostics/CommonModuleNameClientDiagnostic.java          | 2 +-
 .../diagnostics/CommonModuleNameClientServerDiagnostic.java    | 2 +-
 .../diagnostics/CommonModuleNameFullAccessDiagnostic.java      | 2 +-
 .../diagnostics/CommonModuleNameGlobalDiagnostic.java          | 2 +-
 .../diagnostics/CommonModuleNameServerCallDiagnostic.java      | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index cdd27ce8fc9..77b328d9aef 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -48,9 +48,10 @@ protected void check(DocumentContext documentContext) {
     }
 
     documentContext.getMdObject()
+      .filter(CommonModule.class::isInstance)
       .map(CommonModule.class::cast)
       .filter(this::flagsCheck)
-      .filter(commonModule -> !pattern.matcher(commonModule.getName()).matches())
+      .filter(commonModule -> !pattern.matcher(commonModule.getName()).find())
       .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
index 3504fe46350..cfbc384e9bb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
@@ -47,7 +47,7 @@
 )
 public class CommonModuleNameCachedDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*повтисп|^.*сached";
+  private static final String REGEXP = "повтисп|сached";
 
   public CommonModuleNameCachedDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
index d8fa8a39f50..4583ccf34d3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class CommonModuleNameClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*клиент|^.*client";
+  private static final String REGEXP = "клиент|client";
 
   public CommonModuleNameClientDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index ca21c1e0c0a..9bf906774b5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class CommonModuleNameClientServerDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*клиентсервер|^.*clientserver";
+  private static final String REGEXP = "клиентсервер|clientserver";
 
   public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
index 0e97ba0d90f..02551e89377 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class CommonModuleNameFullAccessDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*полныеправа|^.*fullaccess";
+  private static final String REGEXP = "полныеправа|fullaccess";
 
   public CommonModuleNameFullAccessDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
index 501cc8f47da..90ec1b63e45 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class CommonModuleNameGlobalDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*глобальный|^.*global";
+  private static final String REGEXP = "глобальный|global";
 
   public CommonModuleNameGlobalDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
index 433a83469f7..8b4af0d9dcc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -46,7 +46,7 @@
 )
 public class CommonModuleNameServerCallDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^.*вызовсервера|^.*servercall";
+  private static final String REGEXP = "вызовсервера|servercall";
 
   public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);

From 12563b0f45b62458e7623bfb427215855d827013 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 21 Apr 2020 19:41:59 +0300
Subject: [PATCH 186/444] =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD=20=D0=B4=D0=B5?=
 =?UTF-8?q?=D1=84=D0=B0=D1=83=D0=BB=D1=82=20=D1=87=D0=B5=D0=BD=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCommonModuleNameDiagnostic.java      |  4 ++--
 .../CommonModuleNameCachedDiagnosticTest.java    |  2 +-
 .../CommonModuleNameClientDiagnosticTest.java    |  2 +-
 ...mmonModuleNameClientServerDiagnosticTest.java |  2 +-
 ...CommonModuleNameFullAccessDiagnosticTest.java |  2 +-
 ...mmonModuleNameGlobalClientDiagnosticTest.java |  2 +-
 .../CommonModuleNameGlobalDiagnosticTest.java    |  2 +-
 ...CommonModuleNameServerCallDiagnosticTest.java |  2 +-
 .../NonStandardRegionDiagnosticTest.java         | 16 ++++++++--------
 .../Ext/Module.bsl"                              |  7 ++++++-
 10 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 77b328d9aef..f727bd45237 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -43,7 +43,7 @@ public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
 
   @Override
   protected void check(DocumentContext documentContext) {
-    if (documentContext.getTokens().isEmpty()) {
+    if (documentContext.getTokensFromDefaultChannel().isEmpty()) {
       return;
     }
 
@@ -52,7 +52,7 @@ protected void check(DocumentContext documentContext) {
       .map(CommonModule.class::cast)
       .filter(this::flagsCheck)
       .filter(commonModule -> !pattern.matcher(commonModule.getName()).find())
-      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokens().get(0)));
+      .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokensFromDefaultChannel().get(0)));
   }
 
   protected abstract boolean flagsCheck(CommonModule commonModule);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
index 16f5f29188a..a230339b405 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
@@ -70,7 +70,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
index c17a1e3bdca..ef4511bc442 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -70,7 +70,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 65b8d5f2cb0..2adfde03167 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -70,7 +70,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
index 00702ba0fd5..3813afac3e9 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
@@ -70,7 +70,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index 4afd3b392ca..05b43b25c99 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -70,7 +70,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
index 43c3dcfdab7..371ac661396 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
@@ -69,7 +69,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
index 72d87133481..eef9a811986 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -71,7 +71,7 @@ void test() {
     //then
     assertThat(diagnostics).hasSize(1);
     assertThat(diagnostics, true)
-      .hasRange(0, 0, 0, 1);
+      .hasRange(5, 0, 1);
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
index b9b93c99a9c..d653f9ec34e 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
@@ -134,14 +134,14 @@ void testCommonModule() throws IOException {
 
     assertThat(diagnostics).hasSize(8);
     assertThat(diagnostics, true)
-      .hasRange(0, 1, 27)
-      .hasRange(20, 1, 21)
-      .hasRange(28, 1, 32)
-      .hasRange(32, 1, 46)
-      .hasRange(36, 1, 63)
-      .hasRange(40, 1, 31)
-      .hasRange(44, 1, 27)
-      .hasRange(52, 1, 18)
+      .hasRange(5, 1, 27)
+      .hasRange(25, 1, 21)
+      .hasRange(33, 1, 32)
+      .hasRange(37, 1, 46)
+      .hasRange(41, 1, 63)
+      .hasRange(45, 1, 31)
+      .hasRange(49, 1, 27)
+      .hasRange(57, 1, 18)
     ;
   }
 
diff --git "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl" "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
index 7a093ced3cc..feb46be66dd 100644
--- "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
+++ "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
@@ -1,4 +1,9 @@
-#Область ОписаниеПеременных
+
+/////Описание
+/////
+/////
+
+#Область ОписаниеПеременных
 
 Перем ВалютаУчета;
 Перем АдресПоддержки;

From 3bd9829aacb3a0ae3a4fce32db7c1c58e2d638c3 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 27 Apr 2020 13:12:30 +0300
Subject: [PATCH 187/444] Create StyleGuide.md

---
 docs/contributing/StyleGuide.md | 57 +++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 docs/contributing/StyleGuide.md

diff --git a/docs/contributing/StyleGuide.md b/docs/contributing/StyleGuide.md
new file mode 100644
index 00000000000..01d5a71ccfe
--- /dev/null
+++ b/docs/contributing/StyleGuide.md
@@ -0,0 +1,57 @@
+# Руководство по стилю написания кода
+
+В данном документе собраны общие рекомендации по написанию кода в проекте BSL Language Server.
+
+Постарайтесь придерживаться их, и процесс ревью Вашего кода будет гладким и шелковистым (с).
+
+## Форматирование
+
+1. Весь код в модулях должен быть автоматически отформатирован.
+1. Оступы - пробелами
+1. Размер отступа - 2 символа. Continuous indent - тоже два символа. В IntelliJ IDEA настройка отступов по схеме 2-2-2
+
+## Расположение членов класса
+
+1. Расположение полей, методов, модификаторов в целом должно соответствовать рекомендациям Oracle - [File organization](https://www.oracle.com/java/technologies/javase/codeconventions-fileorganization.html), и SonarSource - [Modifiers should be declared in the correct order](https://rules.sonarsource.com/java/tag/convention/RSPEC-1124)
+1. Методы _рекомендуется_ размещать в следующем порядке:
+    1. public методы объекта
+    1. protected/package private методы объекта
+    1. private методы объекта
+    1. public методы класса
+    1. protected/package private методы класса
+    1. private методы класса
+
+## Статический анализ
+
+Код BSL Language Server автоматически проверяется на соответствие стандартам кодирования на сервисе SonarCloud - [ссылка на проект](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server).
+
+Список активированных правил и их настройки можно посмотреть в профиле качества [1c-syntax way](https://sonarcloud.io/organizations/1c-syntax/rules?activation=true&qprofile=AWdJBUnB2EsKsQgQiNpk).
+
+В силу имеющихся ограничений безопасности пулл-реквесты не из репозитория `1c-syntax/bsl-language-server` не проверяются на соответствие стандартам. После принятия пулл-реквеста рекомендуется зайти на [страницу проекта на SonarCloud](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server) и просмотреть список замечаний с фильтрацией по автору. Пулл-реквест с исправлением замечаний приветствуется.
+
+## Линтер
+
+Для улучшения качества кода и предварительной проверки на соответствие стандартам рекомендуется установить в Вашу IDE плагин [SonarLint](https://www.sonarlint.org). 
+
+Для автоматического скачивания и параметризации правил в соответствиями с настройками на SonarCloud может потребоваться "биндинг" локального проекта к проекту SonarCloud. Если в Вашей IDE не получается найти соответствующий проект на SonarCloud, обратитесь к мэйнтейнерам проекта за добавлением Вас в список "Members" на SonarCloud.
+
+## Логирование
+
+Для логирования используется библиотека `Slf4j`. Использование вывода в `System.out` и `System.err` допустимо только в исключительных случаях (например, в обработчиках cli-команд).
+
+Для упрощения создания экземпляра логгера рекомендуется навешивать аннотацию `@lombok.extern.slf4j.Slf4j` на объявление класса.
+
+## Документирование
+
+1. Каждый новый класс обязан иметь javadoc-описание класса. Исключение - классы, реализующие интерфейсы `BSLDiagnostic` или `QuickFixSupplier`.
+1. Каждый новый package обязан иметь `package-info.java` с javadoc-описанием пакета.
+1. Каждый новый публичный метод в `utils`-пакете, классах-хелперах или классах, уже имеющих javadoc-описания, обязан иметь javadoc-описание метода.
+
+## Внешние зависимости
+
+1. Подключение новых библиотек в implementation scope стоит производить аккуратно, с контролем увеличения размера итогового jar-файла. По возможности "лишние" и незадействованные суб-зависимости стоит исключать через `exclude`.
+1. Явное подключение библиотеки `com.google.guava`, `Google Collections` или прочих частей библиотек семейства Guava запрещено. В случае **крайней** необходимости допустимо копирование реализации из `Guava` внутрь BSL Language Server с выполнением условий лицензии Guava. Для всего остального есть Apache Commons.
+1. Прямой импорт классов `*.google.*`, а так же прочих частей библиотек Guava запрещено. Без исключений.
+
+
+> В процессе наполнения...

From 63eb898b50cdd8f81491b776ec83a51548a4a723 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 27 Apr 2020 13:12:55 +0300
Subject: [PATCH 188/444] Update index.md

---
 docs/contributing/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index 460c600d682..8f9d3a541ab 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -7,6 +7,7 @@
 - Старт
   - [Настройка окружения](EnvironmentSetting.md)
   - [Быстрый старт](FastStart.md)
+  - [Руководство по стилю](StyleGuide.md)
 - Разработка диагностик
   - [Процесс (workflow) разработки диагностики](DiagnosticDevWorkFlow.md)
   - [Пример разработки диагностики](DiagnosticExample.md)

From 59844692c03891a3a09dde85c104e9c2d8008ed1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 27 Apr 2020 13:14:49 +0300
Subject: [PATCH 189/444] Update index.md

---
 docs/contributing/index.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index 8f9d3a541ab..8abaa5b9f32 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -5,14 +5,14 @@
 ## Инструкции
 
 - Старт
-  - [Настройка окружения](EnvironmentSetting.md)
-  - [Быстрый старт](FastStart.md)
-  - [Руководство по стилю](StyleGuide.md)
+    - [Настройка окружения](EnvironmentSetting.md)
+    - [Быстрый старт](FastStart.md)
+    - [Руководство по стилю](StyleGuide.md)
 - Разработка диагностик
-  - [Процесс (workflow) разработки диагностики](DiagnosticDevWorkFlow.md)
-  - [Пример разработки диагностики](DiagnosticExample.md)
-  - [Структура диагностики, назначение и содержимое файлов](DiagnosticStructure.md)
-  - [Описание типов и важности диагностик](DiagnosticTypeAndSeverity.md)
-  - [Тэги диагностик](DiagnosticTag.md)
-  - [Добавление параметров диагностике](DiagnostcAddSettings.md)
-  - [Добавление быстрых исправлений диагностик](DiagnosticQuickFix.md)
+    - [Процесс (workflow) разработки диагностики](DiagnosticDevWorkFlow.md)
+    - [Пример разработки диагностики](DiagnosticExample.md)
+    - [Структура диагностики, назначение и содержимое файлов](DiagnosticStructure.md)
+    - [Описание типов и важности диагностик](DiagnosticTypeAndSeverity.md)
+    - [Тэги диагностик](DiagnosticTag.md)
+    - [Добавление параметров диагностике](DiagnostcAddSettings.md)
+    - [Добавление быстрых исправлений диагностик](DiagnosticQuickFix.md)

From 742092b54eadac6e8185ef2dee66cd60149a9e04 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 27 Apr 2020 14:04:22 +0300
Subject: [PATCH 190/444] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=84=D0=BF=20=D0=9A=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=A7?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE=D0=A2=D0=BE=D0=93=D0=BB=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nModuleNameGlobalClientDiagnosticTest.java | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index 05b43b25c99..41c9b1cc256 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -74,6 +74,29 @@ void test() {
 
   }
 
+  @Test
+  void testEng() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоClientGlobal");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
+
   @Test
   void testNegative() {
 
@@ -113,6 +136,26 @@ void testFalse() {
 
   }
 
+  @Test
+  void testClientAtStart() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("КлиентЛицензированияГлобальный");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
   @SneakyThrows
   void getDocumentContextFromFile() {
 

From 3d936d8606464bf8ebbe0cde125fb3ffb7641cbd Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 27 Apr 2020 17:36:57 +0300
Subject: [PATCH 191/444] fp fix

---
 .../diagnostics/CommonModuleNameGlobalClientDiagnostic.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
index 72a210f2f81..a3418f144c3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -44,7 +44,7 @@
 )
 public class CommonModuleNameGlobalClientDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "^(?>(?!Клиент|client).)*$";
+  private static final String REGEXP = "^(?>(?!.+клиент|.+client).)*$";
 
   public CommonModuleNameGlobalClientDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);

From 4efa4334c03a40bbc4bf5dd8bfd51fa82284c0b9 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 27 Apr 2020 17:37:35 +0300
Subject: [PATCH 192/444] utils.CaseInsentivitesPatern

---
 build.gradle.kts                                    |  2 +-
 .../AbstractCommonModuleNameDiagnostic.java         | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 560d4686f15..d5df81751b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,7 +86,7 @@ dependencies {
         exclude("org.glassfish", "javax.json")
     }
 
-    implementation("com.github.1c-syntax", "utils", "0.2.1")
+    implementation("com.github.1c-syntax", "utils", "4034e83681b")
     implementation("com.github.1c-syntax", "mdclasses", "86be1579c4")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index f727bd45237..3b54681df91 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -24,7 +24,11 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
@@ -34,10 +38,7 @@ abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
   public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
     super(info);
 
-    pattern = Pattern.compile(
-      regexp,
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+    pattern = CaseInsensitivePattern.compile(regexp);
 
   }
 
@@ -51,7 +52,9 @@ protected void check(DocumentContext documentContext) {
       .filter(CommonModule.class::isInstance)
       .map(CommonModule.class::cast)
       .filter(this::flagsCheck)
-      .filter(commonModule -> !pattern.matcher(commonModule.getName()).find())
+      .map(MDObjectBase::getName)
+      .map(pattern::matcher)
+      .filter(Predicate.not(Matcher::find))
       .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokensFromDefaultChannel().get(0)));
   }
 

From 58cf2407aa5467f408d077e43a8df92f1854daea Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 27 Apr 2020 17:37:52 +0300
Subject: [PATCH 193/444] tests

---
 .../CommonModuleNameCachedDiagnostic.java     |  2 +-
 .../CommonModuleNameCachedDiagnosticTest.java | 20 ++++++++++
 ...nModuleNameGlobalClientDiagnosticTest.java | 40 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
index cfbc384e9bb..b586efc8ba1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnostic.java
@@ -47,7 +47,7 @@
 )
 public class CommonModuleNameCachedDiagnostic extends AbstractCommonModuleNameDiagnostic {
 
-  private static final String REGEXP = "повтисп|сached";
+  private static final String REGEXP = "повнорноеиспользование|повтисп|сached";
 
   public CommonModuleNameCachedDiagnostic(DiagnosticInfo info) {
     super(info, REGEXP);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
index a230339b405..1e5ccc8cf06 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
@@ -74,6 +74,25 @@ void test() {
 
   }
 
+  @Test
+  void testSession() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТоПовтИсп");
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DURING_SESSION);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
   @Test
   void testNegative() {
 
@@ -93,6 +112,7 @@ void testNegative() {
 
   }
 
+
   @Test
   void testEmptyFile() {
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index 41c9b1cc256..eb4980d0cd5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -156,6 +156,46 @@ void testClientAtStart() {
 
   }
 
+  @Test
+  void testClientAtStartEng() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ClientЛицензированияГлобальный");
+    when(module.isGlobal()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testClient() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ClientЛицензированияГлобальный");
+    when(module.isGlobal()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
   @SneakyThrows
   void getDocumentContextFromFile() {
 

From 7aa3a3b9f354f0e75b00be014e2dcd9fd2b26b80 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 27 Apr 2020 17:38:27 +0300
Subject: [PATCH 194/444] precommit

---
 docs/diagnostics/index.md                          |  4 ++--
 docs/en/diagnostics/index.md                       |  4 ++--
 .../configuration/parameters-schema.json           | 14 +++++++-------
 .../bsl/languageserver/configuration/schema.json   | 14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 0af57c0bf58..811b796be66 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **98**
+Общее количество: **101**
 
-* Дефект кода: **62**
+* Дефект кода: **65**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **3**
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index f910d750141..e7561eff8e2 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **98**
+Total: **101**
 
 * Error: **31**
-* Code smell: **59**
+* Code smell: **65**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
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 d76007a2b66..9be08e89978 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
@@ -108,7 +108,7 @@
         },
         "CommonModuleNameCached": {
             "description": "Missed postfix \"Cached\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -118,7 +118,7 @@
         },
         "CommonModuleNameClient": {
             "description": "Missed postfix \"Client\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -128,7 +128,7 @@
         },
         "CommonModuleNameClientServer": {
             "description": "Missed postfix \"ClientServer\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -138,7 +138,7 @@
         },
         "CommonModuleNameFullAccess": {
             "description": "Missed postfix \"FullAccess\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -148,7 +148,7 @@
         },
         "CommonModuleNameGlobal": {
             "description": "Missed postfix \"Global\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -158,7 +158,7 @@
         },
         "CommonModuleNameGlobalClient": {
             "description": "Global module with postfix \"Client\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -168,7 +168,7 @@
         },
         "CommonModuleNameServerCall": {
             "description": "Missed postfix \"ServerCall\"",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
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 638c4586703..7b857252e49 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
@@ -48,25 +48,25 @@
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
                 "CommonModuleNameCached": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameCached"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameCached"
                 },
                 "CommonModuleNameClient": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameClient"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameClient"
                 },
                 "CommonModuleNameClientServer": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameClientServer"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameClientServer"
                 },
                 "CommonModuleNameFullAccess": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameFullAccess"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameFullAccess"
                 },
                 "CommonModuleNameGlobal": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobal"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameGlobal"
                 },
                 "CommonModuleNameGlobalClient": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameGlobalClient"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameGlobalClient"
                 },
                 "CommonModuleNameServerCall": {
-                    "$ref": "diagnostics-schema.json#/definitions/CommonModuleNameServerCall"
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameServerCall"
                 },
                 "CompilationDirectiveLost": {
                     "$ref": "parameters-schema.json#/definitions/CompilationDirectiveLost"

From af8af0c6798d3a4902d590b55c777a1da3fccf25 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 00:02:18 +0700
Subject: [PATCH 195/444] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=20"=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D1=8F?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?=
 =?UTF-8?q?"=20=D0=B8=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 26 +++++++----
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 43 ++++++++++++++-----
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl | 10 +++++
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 5176fc3fb2a..010a338418c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 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.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;
@@ -59,6 +60,14 @@ public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagn
   private static final Pattern pattern = Pattern.compile(
     "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
+  private static final boolean CHECK_ATTACHABLE_METHODS = true;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + CHECK_ATTACHABLE_METHODS
+  )
+  private boolean checkAttachableMethods = CHECK_ATTACHABLE_METHODS;
+
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -66,14 +75,15 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
 
-    var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
-      .map(BSLParser.FuncDeclarationContext::subName)
-      .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
-      .isPresent();
-
-    // Исключаем подключаемые методы
-    if (abortCheck) {
-      return ctx;
+    if (checkAttachableMethods) {
+      // Исключаем подключаемые методы
+      var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
+        .map(BSLParser.FuncDeclarationContext::subName)
+        .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
+        .isPresent();
+      if (abortCheck) {
+        return ctx;
+      }
     }
 
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index b4d1a3cd769..7bc3af568ce 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -21,11 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Diagnostic;
 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;
 
@@ -37,16 +37,39 @@ class FunctionReturnsSamePrimitiveDiagnosticTest extends AbstractDiagnosticTest<
   @Test
   void test() {
 
-    List<Diagnostic> diagnostics = getDiagnostics();
+    List<Diagnostic> diagnostics;
+    Map<String, Object> configuration;
 
-  assertThat(diagnostics)
-    .hasSize(3)
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(0, 8, 0, 23)))
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(25, 8, 25, 14)))
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(35, 8, 35, 17)));
+    // Проверяем срабатывания с параметрами по умолчанию
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(4)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(62, 8, 22);
+
+    // Проверяем с выключенным параметром checkAttachableMethods
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("checkAttachableMethods", false);
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(6)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(52, 8, 35)
+      .hasRange(62, 8, 22)
+      .hasRange(72, 9, 32);
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 046db69df92..d2d1c8ca1ce 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -60,6 +60,16 @@
 
 КонецФункции
 
+Функция КакаяТоКоманда(Команда) // <- ошибка
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Null;
+    КонецЕсли;
+
+    Возврат NULL;
+
+КонецФункции
+
 Function Attachable_RandomAction(Command)
 
     If ValueIsFilled(CurrentDate) Then

From 406078f2faa521663e0bc245bd226ab56d355776 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 00:03:01 +0700
Subject: [PATCH 196/444] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/FunctionReturnsSamePrimitive.md       | 10 +++++++++-
 docs/en/diagnostics/FunctionReturnsSamePrimitive.md    | 10 +++++++++-
 .../configuration/parameters-schema.json               |  8 ++++++++
 .../bsl/languageserver/configuration/schema.json       |  3 ---
 ...unctionReturnsSamePrimitiveDiagnostic_en.properties |  1 +
 ...unctionReturnsSamePrimitiveDiagnostic_ru.properties |  1 +
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 41eb85dc3d6..03bc179021a 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -4,6 +4,12 @@
 | :-: | :-: | :-: | :-: | :-: | :-: |
 | `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `design`<br/>`badpractice` |
 
+## Параметры 
+
+| Имя | Тип | Описание | Значение по умолчанию |
+| :-: | :-: | :-- | :-: |
+| `checkAttachableMethods` | `Булево` | ```Проверять подключаемые методы``` | ```true``` |
+
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -82,5 +88,7 @@
 ### Параметр конфигурационного файла
 
 ```json
-"FunctionReturnsSamePrimitive": false
+"FunctionReturnsSamePrimitive": {
+    "checkAttachableMethods": true
+}
 ```
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index 01ac1e2515f..d78f5bf2663 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -4,6 +4,12 @@
 | :-: | :-: | :-: | :-: | :-: | :-: |
 | `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `design`<br/>`badpractice` |
 
+## Parameters 
+
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `checkAttachableMethods` | `Boolean` | ```Check attachable methods``` | ```true``` |
+
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -82,5 +88,7 @@ EndFunction
 ### Parameter for config
 
 ```json
-"FunctionReturnsSamePrimitive": false
+"FunctionReturnsSamePrimitive": {
+    "checkAttachableMethods": true
+}
 ```
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 2830240940e..f20a2b36c8c 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
@@ -362,6 +362,14 @@
                 "object"
             ],
             "title": "The function always returns the same primitive value",
+            "properties": {
+                "checkAttachableMethods": {
+                    "description": "Check attachable methods",
+                    "default": true,
+                    "type": "boolean",
+                    "title": "Check attachable methods"
+                }
+            },
             "$id": "#/definitions/FunctionReturnsSamePrimitive"
         },
         "FunctionShouldHaveReturn": {
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 4f0285d425d..5fa984b3ec9 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
@@ -113,9 +113,6 @@
                 "FunctionReturnsSamePrimitive": {
                     "$ref": "parameters-schema.json#/definitions/FunctionReturnsSamePrimitive"
                 },
-                "FunctionReturnsSamePrimitive": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
-                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index fb0ac7ddbfc..d7f0db77485 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,3 +1,4 @@
 diagnosticMessage=Check that the same primitive value is returned in the function
 diagnosticName=The function always returns the same primitive value
 diagnosticMessageReturnStatement=Repeat return value
+checkAttachableMethods=Check attachable methods
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index 2ac2ec79e1b..3143159f75c 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,3 +1,4 @@
 diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
 diagnosticName=Функция всегда возвращает одно и то же примитивное значение
 diagnosticMessageReturnStatement=Повтор возвращаемого значения
+checkAttachableMethods=Проверять подключаемые методы

From ccbc9212c28de9a81e4c5c5319079e0cc9a87894 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 10:38:29 +0700
Subject: [PATCH 197/444] =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=D0=BE=D0=BA,=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B9=D0=BC=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D0=BC,=20=D1=80=D0=B0=D1=81=D1=88=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           |  6 ++-
 .../FunctionReturnsSamePrimitive.md           |  6 ++-
 ...unctionReturnsSamePrimitiveDiagnostic.java | 40 ++++++++++++-------
 .../configuration/parameters-schema.json      | 12 ++++--
 ...turnsSamePrimitiveDiagnostic_en.properties |  3 +-
 ...turnsSamePrimitiveDiagnostic_ru.properties |  3 +-
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 29 +++++++++++---
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl |  7 ++--
 8 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 03bc179021a..fe18bf533df 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -8,7 +8,8 @@
 
 | Имя | Тип | Описание | Значение по умолчанию |
 | :-: | :-: | :-- | :-: |
-| `checkAttachableMethods` | `Булево` | ```Проверять подключаемые методы``` | ```true``` |
+| `skipAttachable` | `Булево` | ```Не учитывать подключаемые методы``` | ```true``` |
+| `caseSensitiveForString` | `Булево` | ```Учитывать регистр в строковых значениях``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -89,6 +90,7 @@
 
 ```json
 "FunctionReturnsSamePrimitive": {
-    "checkAttachableMethods": true
+    "skipAttachable": true,
+    "caseSensitiveForString": false
 }
 ```
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index d78f5bf2663..b51a70af555 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -8,7 +8,8 @@
 
 | Name | Type | Description | Default value |
 | :-: | :-: | :-- | :-: |
-| `checkAttachableMethods` | `Boolean` | ```Check attachable methods``` | ```true``` |
+| `skipAttachable` | `Boolean` | ```Ignore attachable methods``` | ```true``` |
+| `caseSensitiveForString` | `Boolean` | ```Case sensitive for strings``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -89,6 +90,7 @@ EndFunction
 
 ```json
 "FunctionReturnsSamePrimitive": {
-    "checkAttachableMethods": true
+    "skipAttachable": true,
+    "caseSensitiveForString": false
 }
 ```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 010a338418c..0f6f2e754ae 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -60,13 +60,20 @@ public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagn
   private static final Pattern pattern = Pattern.compile(
     "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private static final boolean CHECK_ATTACHABLE_METHODS = true;
+  private static final boolean SKIP_ATTACHABLE = true;
+  private static final boolean CASE_SENSITIVE_FOR_STRING = false;
 
   @DiagnosticParameter(
     type = Boolean.class,
-    defaultValue = "" + CHECK_ATTACHABLE_METHODS
+    defaultValue = "" + SKIP_ATTACHABLE
   )
-  private boolean checkAttachableMethods = CHECK_ATTACHABLE_METHODS;
+  private boolean skipAttachable = SKIP_ATTACHABLE;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + CASE_SENSITIVE_FOR_STRING
+  )
+  private boolean caseSensitiveForString = CASE_SENSITIVE_FOR_STRING;
 
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -75,7 +82,7 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
 
-    if (checkAttachableMethods) {
+    if (skipAttachable) {
       // Исключаем подключаемые методы
       var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
         .map(BSLParser.FuncDeclarationContext::subName)
@@ -108,16 +115,12 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
   private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
-    var set = expressions.stream()
-      .map((BSLParser.ExpressionContext expression) -> {
-        var text = expression.getText();
-        if (Trees.findAllRuleNodes(expression, BSLParser.RULE_string).isEmpty()) {
-          text = text.toUpperCase(Locale.ENGLISH);
-        }
-        return text;
-      })
-      .collect(Collectors.toSet());
-    if (set.size() == 1) {
+    var count = expressions.stream()
+      .map(this::getExpressionText)
+      .distinct()
+      .count();
+
+    if (count == 1) {
       var relatedInformation = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
         .map(statement -> RelatedInformation.create(
@@ -125,11 +128,18 @@ private void checkPrimitiveValue(
           Ranges.create(statement.getStart()),
           info.getResourceString(KEY_MESSAGE)))
         .collect(Collectors.toList());
-      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), info.getMessage(), relatedInformation);
+      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), relatedInformation);
     }
 
   }
 
+  private String getExpressionText(BSLParser.ExpressionContext expression) {
+    if (caseSensitiveForString && Trees.nodeContains(expression, BSLParser.RULE_string)) {
+      return expression.getText();
+    }
+    return expression.getText().toUpperCase(Locale.ENGLISH);
+  }
+
   private Range getSubNameRange(ParserRuleContext ctx) {
     return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
       .map(BSLParser.SubContext.class::cast)
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 f20a2b36c8c..2c6ba1dd70d 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
@@ -363,11 +363,17 @@
             ],
             "title": "The function always returns the same primitive value",
             "properties": {
-                "checkAttachableMethods": {
-                    "description": "Check attachable methods",
+                "skipAttachable": {
+                    "description": "Ignore attachable methods",
                     "default": true,
                     "type": "boolean",
-                    "title": "Check attachable methods"
+                    "title": "Ignore attachable methods"
+                },
+                "caseSensitiveForString": {
+                    "description": "Case sensitive for strings",
+                    "default": false,
+                    "type": "boolean",
+                    "title": "Case sensitive for strings"
                 }
             },
             "$id": "#/definitions/FunctionReturnsSamePrimitive"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index d7f0db77485..4be88d7f729 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,4 +1,5 @@
 diagnosticMessage=Check that the same primitive value is returned in the function
 diagnosticName=The function always returns the same primitive value
 diagnosticMessageReturnStatement=Repeat return value
-checkAttachableMethods=Check attachable methods
+skipAttachable=Ignore attachable methods
+caseSensitiveForString=Case sensitive for strings
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index 3143159f75c..eadc148c869 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,4 +1,5 @@
 diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
 diagnosticName=Функция всегда возвращает одно и то же примитивное значение
 diagnosticMessageReturnStatement=Повтор возвращаемого значения
-checkAttachableMethods=Проверять подключаемые методы
+skipAttachable=Не учитывать подключаемые методы
+caseSensitiveForString=Учитывать регистр в строковых значениях
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 7bc3af568ce..00fd8cafb34 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -48,28 +48,45 @@ void test() {
 
     // then
     assertThat(diagnostics, true)
-      .hasSize(4)
+      .hasSize(5)
       .hasRange(0, 8, 23)
       .hasRange(25, 8, 14)
       .hasRange(35, 8, 17)
-      .hasRange(62, 8, 22);
+      .hasRange(62, 8, 22)
+      .hasRange(82, 8, 32);
 
-    // Проверяем с выключенным параметром checkAttachableMethods
+    // Проверяем с выключенным параметром skipAttachable
     // when
     configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
-    configuration.put("checkAttachableMethods", false);
+    configuration.put("skipAttachable", false);
     diagnosticInstance.configure(configuration);
     diagnostics = getDiagnostics();
 
     // then
     assertThat(diagnostics, true)
-      .hasSize(6)
+      .hasSize(7)
       .hasRange(0, 8, 23)
       .hasRange(25, 8, 14)
       .hasRange(35, 8, 17)
       .hasRange(52, 8, 35)
       .hasRange(62, 8, 22)
-      .hasRange(72, 9, 32);
+      .hasRange(72, 9, 32)
+      .hasRange(82, 8, 32);
+
+    // Проверяем с включенным параметром caseSensitiveForString
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("caseSensitiveForString", true);
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(4)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(62, 8, 22);
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index d2d1c8ca1ce..df2cf3995b3 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -50,7 +50,7 @@
     Возврат Значение;
 КонецФункции
 
-Функция Подключаемый_КакаяТоКоманда(Команда)
+Функция Подключаемый_КакаяТоКоманда(Команда) // <- ошибки (опционально)
 
     Если ЗначениеЗаполнено(ТекущаяДата) Тогда
         Возврат Null;
@@ -70,7 +70,7 @@
 
 КонецФункции
 
-Function Attachable_RandomAction(Command)
+Function Attachable_RandomAction(Command) // <- ошибки (опционально)
 
     If ValueIsFilled(CurrentDate) Then
         Return Undefined;
@@ -80,8 +80,7 @@ Function Attachable_RandomAction(Command)
 
 EndFunction
 
-// тут нет ошибки
-Функция ПроверкаРегистраДляСтрок()
+Функция ПроверкаРегистраДляСтрок() // <- ошибки (опционально)
 
     Тип = 1;
     Если Тип = 1 Тогда

From e78235cee50d99f5f0ab7bac98002239ff3fd5de Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sat, 25 Apr 2020 23:29:52 +0700
Subject: [PATCH 198/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B1=D0=BB=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 68 +++++++++++++++++++
 ...turnsSamePrimitiveDiagnostic_en.properties |  2 +
 ...turnsSamePrimitiveDiagnostic_ru.properties |  2 +
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 23 +++++++
 .../FunctionReturnsSameValueDiagnostic.bsl    | 52 ++++++++++++++
 5 files changed, 147 insertions(+)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
new file mode 100644
index 00000000000..6c7c1c750b4
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -0,0 +1,68 @@
+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.utils.Ranges;
+import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.checkerframework.checker.nullness.Opt;
+import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+
+import javax.tools.Diagnostic;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.BADPRACTICE
+  }
+
+)
+public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+  public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+    var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
+    if (tree.size() > 1){
+      var set = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(BSLParser.ReturnStatementContext::expression)
+        .flatMap(Stream::ofNullable)
+        .map(BSLParser.ExpressionContext::getText)
+        .collect(Collectors.toSet());
+      if (set.size() == 1) {
+        var relatedInformation = tree.stream()
+          .map(BSLParser.ReturnStatementContext.class::cast)
+          .map(statement ->
+            RelatedInformation.create(
+              documentContext.getUri(),
+              Ranges.create(statement.getStart()),
+              info.getMessage()))
+          .collect(Collectors.toList());
+        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
+      }
+    }
+    return ctx;
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
new file mode 100644
index 00000000000..66831715dfd
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=<Message>
+diagnosticName=<Diagnostic name>
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
new file mode 100644
index 00000000000..df22ba92595
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
+diagnosticName=Функция всегда возвращает одно и то же значение
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
new file mode 100644
index 00000000000..1517ec60634
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -0,0 +1,23 @@
+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 FunctionReturnsSamePrimitiveDiagnosticTest extends AbstractDiagnosticTest<FunctionReturnsSamePrimitiveDiagnostic> {
+  FunctionReturnsSamePrimitiveDiagnosticTest() {
+    super(FunctionReturnsSamePrimitiveDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+  assertThat(diagnostics).hasSize(4);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
new file mode 100644
index 00000000000..c8e246d08f3
--- /dev/null
+++ b/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
@@ -0,0 +1,52 @@
+Функция ПроверитьСтроку(Знач СтрокаТаблицы) // <-- ошибка
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+КонецФункции
+
+Функция БудемТестироватьФункциональность()
+    Возврат Ложь;
+КонецФункции
+
+Функция ВернутьСтроку()
+    Возврат "Истина";
+КонецФункции
+
+Процедура СделаемЧтоНибудь()
+    Значение = Истина;
+    Возврат;
+КонецПроцедуры
+
+Функция Метод1() // <-- ошибка
+    Значение = "Фича";
+    Если Фича = "Дирижабль" Тогда
+        Возврат "Фича";
+    ИначеЕсли Фича = "Ага" Тогда
+        Возврат "Фича";
+    КонецЕсли;
+    Возврат "Фича";
+КонецФункции
+
+Функция СтавкаНДС(Ставка) // <-- ошибка
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат 20;
+    КонецЕсли;
+    Возврат 20;
+КонецФункции
+
+// надо бы подумать как правильно диагностировать
+// по идее ошибка
+Функция СтавкаНДС2(Ставка)
+    Значение = 20;
+    Если Ставка = "Ставка18" Тогда
+        Возврат Значение;
+    КонецЕсли;
+    Возврат Значение;
+КонецФункции
\ No newline at end of file

From 3a8ad5cb8452122a925bd3ed985a6e3e3c025203 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:23:36 +0700
Subject: [PATCH 199/444] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D0=B8=D0=B2=D0=BE=D0=B2,=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20ru,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BA=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           | 71 ++++++++++++++
 .../FunctionReturnsSamePrimitive.md           | 36 +++++++
 ...unctionReturnsSamePrimitiveDiagnostic.java | 96 +++++++++++++------
 ...turnsSamePrimitiveDiagnostic_en.properties |  5 +-
 ...turnsSamePrimitiveDiagnostic_ru.properties |  5 +-
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 10 +-
 ...unctionReturnsSamePrimitiveDiagnostic.bsl} |  3 +-
 7 files changed, 192 insertions(+), 34 deletions(-)
 create mode 100644 docs/diagnostics/FunctionReturnsSamePrimitive.md
 create mode 100644 docs/en/diagnostics/FunctionReturnsSamePrimitive.md
 rename src/test/resources/diagnostics/{FunctionReturnsSameValueDiagnostic.bsl => FunctionReturnsSamePrimitiveDiagnostic.bsl} (94%)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..464ba00e5f5
--- /dev/null
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,71 @@
+# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Функция не должна возвращать одно и тоже примитивное значение. Если результат функции не учитывается - то нужно функцию 
+переписать на процедуру.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+Плохо:
+```bsl
+Функция ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+        Возврат Истина;
+     Иначе
+        Возврат Истина;
+    КонецЕсли;
+
+КонецФункции
+```
+
+Хорошо:
+```bsl
+Процедура ПроверитьСтроку(Знач СтрокаТаблицы)
+
+    Если ЭтоХорошаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    ИначеЕсли ЭтоТожеНеплохаяСтрока(СтрокаТаблицы) Тогда
+        ДелаемДругоеЧтоТоЧтобыНеРугаласьПроверкаНаПовтор();
+    Иначе
+        ДелаемЧтотоДругоеИзВеткиИначе();
+    КонецЕсли;
+
+КонецПроцедуры
+```
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 6c7c1c750b4..c0dc94b38af 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -1,5 +1,27 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 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;
@@ -8,35 +30,31 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
-import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.checkerframework.checker.nullness.Opt;
-import org.eclipse.lsp4j.DiagnosticRelatedInformation;
+import org.eclipse.lsp4j.Range;
 
-import javax.tools.Diagnostic;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
-  severity = DiagnosticSeverity.INFO,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MAJOR,
+  minutesToFix = 5,
   tags = {
+    DiagnosticTag.DESIGN,
     DiagnosticTag.BADPRACTICE
   }
 
 )
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
+
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -44,25 +62,49 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
-    if (tree.size() > 1){
-      var set = tree.stream()
+    if (tree.size() > 1) {
+      var expressions = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
         .map(BSLParser.ReturnStatementContext::expression)
         .flatMap(Stream::ofNullable)
-        .map(BSLParser.ExpressionContext::getText)
-        .collect(Collectors.toSet());
-      if (set.size() == 1) {
-        var relatedInformation = tree.stream()
-          .map(BSLParser.ReturnStatementContext.class::cast)
-          .map(statement ->
-            RelatedInformation.create(
-              documentContext.getUri(),
-              Ranges.create(statement.getStart()),
-              info.getMessage()))
-          .collect(Collectors.toList());
-        diagnosticStorage.addDiagnostic(ctx.funcDeclaration(), info.getMessage(), relatedInformation);
-      }
+        .collect(Collectors.toList());
+
+      expressions.stream()
+        .map(expression -> Trees.findAllRuleNodes(expression, BSLParser.RULE_complexIdentifier))
+        .filter(Collection::isEmpty)
+        .findAny()
+        .ifPresent(
+          parseTrees -> checkPrimitiveValue(ctx, tree, expressions)
+        );
     }
     return ctx;
   }
+
+  private void checkPrimitiveValue(
+    BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
+
+    var set = expressions.stream().map(BSLParser.ExpressionContext::getText).collect(Collectors.toSet());
+    if (set.size() == 1) {
+      var relatedInformation = tree.stream()
+        .map(BSLParser.ReturnStatementContext.class::cast)
+        .map(statement -> RelatedInformation.create(
+          documentContext.getUri(),
+          Ranges.create(statement.getStart()),
+          info.getResourceString(KEY_MESSAGE)))
+        .collect(Collectors.toList());
+      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), info.getMessage(), relatedInformation);
+    }
+
+  }
+
+  private Range getSubNameRange(ParserRuleContext ctx) {
+    return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
+      .map(BSLParser.SubContext.class::cast)
+      .map(context -> documentContext.getSymbolTree().getMethodSymbol(context))
+      .filter(Optional::isPresent)
+      .map(Optional::get)
+      .map(MethodSymbol::getSubNameRange)
+      .orElse(Ranges.create(ctx.getStart()));
+  }
+
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index 66831715dfd..fb0ac7ddbfc 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=<Message>
-diagnosticName=<Diagnostic name>
+diagnosticMessage=Check that the same primitive value is returned in the function
+diagnosticName=The function always returns the same primitive value
+diagnosticMessageReturnStatement=Repeat return value
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index df22ba92595..2ac2ec79e1b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,2 +1,3 @@
-diagnosticMessage=Проверьте правильность возврата одного и того жк значения в функции
-diagnosticName=Функция всегда возвращает одно и то же значение
+diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
+diagnosticName=Функция всегда возвращает одно и то же примитивное значение
+diagnosticMessageReturnStatement=Повтор возвращаемого значения
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1517ec60634..1af20cc2524 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,5 +1,6 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +18,14 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-  assertThat(diagnostics).hasSize(4);
+  assertThat(diagnostics)
+    .hasSize(3)
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(0, 8, 0, 23)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(25, 8, 25, 14)))
+    .anyMatch(diagnostic -> diagnostic.getRange().equals(
+      Ranges.create(35, 8, 35, 17)));
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
similarity index 94%
rename from src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
rename to src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index c8e246d08f3..66f0df2975e 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSameValueDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -41,8 +41,7 @@
     Возврат 20;
 КонецФункции
 
-// надо бы подумать как правильно диагностировать
-// по идее ошибка
+// здесь нет ошибки, т.к. проверка только на примитивы
 Функция СтавкаНДС2(Ставка)
     Значение = 20;
     Если Ставка = "Ставка18" Тогда

From e2f0d2777eb05e17622e2369ff509b16e240555e Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 13:21:12 +0700
Subject: [PATCH 200/444] no message

---
 .../FunctionReturnsSamePrimitive.md           | 18 +++----
 docs/diagnostics/index.md                     | 22 ++------
 .../FunctionReturnsSamePrimitive.md           | 51 ++++++++++++++++---
 docs/en/diagnostics/index.md                  | 22 ++------
 .../configuration/parameters-schema.json      | 10 ++++
 .../languageserver/configuration/schema.json  |  3 ++
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 21 ++++++++
 7 files changed, 96 insertions(+), 51 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 464ba00e5f5..cbd70345b65 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,8 +1,8 @@
-# Функция всегда возвращает одно и то же примитивное значение (<DiagnosticKey>)
+# Функция всегда возвращает одно и то же примитивное значение (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -55,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"FunctionReturnsSamePrimitive": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 811b796be66..0fab59f2d5f 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,12 +8,12 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **101**
+Общее количество: **89**
 
-* Дефект кода: **65**
+* Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **31**
-* Потенциальная уязвимость: **3**
+* Ошибка: **30**
+* Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
 | --- | --- | :-: | --- | --- | --- |
@@ -24,35 +24,23 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
-| [CommonModuleNameCached](CommonModuleNameCached.md) | Пропущен постфикс "ПовтИсп" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClient](CommonModuleNameClient.md) | Пропущен постфикс "Клиент" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Пропущен постфикс "КлиентСервер" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Пропущен постфикс "ПолныеПрава" | Да | Важный | Потенциальная уязвимость | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Пропущен постфикс "Глобальный" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`brainoverload` |
-| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Глобальный модуль с постфиксом "Клиент" | Да | Важный | Дефект кода | `standard` |
-| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Пропущен постфикс "ВызовСервера" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
-| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Устаревшие объекты платформы 8.3.12 | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | Функция всегда возвращает одно и то же примитивное значение | Да | Важный | Ошибка | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | Функция должна содержать возврат | Да | Важный | Ошибка | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | Использование метода ПолучитьФорму | Да | Важный | Ошибка | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | Одинаковые выражения слева и справа от "foo" оператора | Да | Важный | Ошибка | `suspicious` |
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index 4e7e0f78ada..a7b5d484497 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -1,16 +1,51 @@
-# <Diagnostic name>
+# The function always returns the same primitive value (FunctionReturnsSamePrimitive)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `design`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+A function should not return the same primitive value. If the result of the function isn't use into code, then you need the function
+rewrite to the procedure.
+
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+Bad:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+        Return True;
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+        Return True;
+     Else
+        Return True;
+    EndIf;
+
+EndFunction
+```
+
+Good:
+```bsl
+Function CheckString(Val RowTable)
+
+    If ItsGoodString(RowTable) Then
+        ActionGood();
+    ElsIf ItsNodBadString(RowTable) Then
+        ActionNoBad();
+    Else
+        ActionElse();
+    EndIf;
+
+EndFunction
+```
+
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -20,17 +55,17 @@
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:FunctionReturnsSamePrimitive-off
+// BSLLS:FunctionReturnsSamePrimitive-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"FunctionReturnsSamePrimitive": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index e7561eff8e2..b22ab4029d5 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: **101**
+Total: **89**
 
-* Error: **31**
-* Code smell: **65**
+* Error: **30**
+* Code smell: **55**
 * Vulnerability: **2**
-* Security Hotspot: **3**
+* Security Hotspot: **2**
 
 | Key | Name| Enabled by default | Severity | Type | Tags |
 | --- | --- | :-: | --- | --- | --- |
@@ -24,35 +24,23 @@ Total: **101**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
-| [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
-| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
-| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
-| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br/>`badpractice` |
 | [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br/>`unpredictable` |
 | [GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error` |
 | [IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious` |
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 9be08e89978..415ffffb029 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
@@ -424,6 +424,16 @@
             "title": "Function name shouldn't start with \"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\"",
             "$id": "#/definitions/FunctionNameStartsWithGet"
         },
+        "FunctionReturnsSamePrimitive": {
+            "description": "The function always returns the same primitive value",
+            "default": null,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "The function always returns the same primitive value",
+            "$id": "#/definitions/FunctionReturnsSamePrimitive"
+        },
         "FunctionShouldHaveReturn": {
             "description": "The function should have return",
             "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 7b857252e49..613e032d3f2 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
@@ -131,6 +131,9 @@
                 "FunctionNameStartsWithGet": {
                     "$ref": "parameters-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
+                "FunctionReturnsSamePrimitive": {
+                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 1af20cc2524..b4d1a3cd769 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.utils.Ranges;

From c666ebf83d77160d59ec3c4c31e559356d1a952b Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 02:14:16 +0700
Subject: [PATCH 201/444] =?UTF-8?q?+=20=D0=BF=D1=80=D0=B5=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/index.md                             | 11 ++++++++---
 docs/en/diagnostics/index.md                          | 11 ++++++++---
 .../configuration/parameters-schema.json              |  2 +-
 .../bsl/languageserver/configuration/schema.json      |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 0fab59f2d5f..2dfbde26f8d 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **89**
+Общее количество: **94**
 
-* Дефект кода: **55**
+* Дефект кода: **58**
 * Уязвимость: **2**
-* Ошибка: **30**
+* Ошибка: **32**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -24,19 +24,24 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index b22ab4029d5..2f31a4424d4 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **89**
+Total: **94**
 
-* Error: **30**
-* Code smell: **55**
+* Error: **32**
+* Code smell: **58**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -24,19 +24,24 @@ Total: **89**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
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 415ffffb029..973b4fb13c8 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
@@ -426,7 +426,7 @@
         },
         "FunctionReturnsSamePrimitive": {
             "description": "The function always returns the same primitive value",
-            "default": null,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
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 613e032d3f2..dd5960db17f 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
@@ -132,7 +132,7 @@
                     "$ref": "parameters-schema.json#/definitions/FunctionNameStartsWithGet"
                 },
                 "FunctionReturnsSamePrimitive": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                    "$ref": "parameters-schema.json#/definitions/FunctionReturnsSamePrimitive"
                 },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"

From c5f53a5ce08e5aaa27d7edf843c73b9cc478e613 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 01:38:38 +0700
Subject: [PATCH 202/444] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D1=8F,=20=D0=B7=D0=B0=D0=BF=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=20=D0=BF=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=82=D0=B5=D1=80=D1=8F=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=BB=D0=B8=D1=86=D0=B5=D0=BD=D0=B7=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/index.md                     |  11 +-
 docs/en/diagnostics/index.md                  |  11 +-
 .../configuration/parameters-schema.json      | 332 +++++-------------
 .../languageserver/configuration/schema.json  |   3 +
 4 files changed, 102 insertions(+), 255 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 2dfbde26f8d..0fab59f2d5f 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **94**
+Общее количество: **89**
 
-* Дефект кода: **58**
+* Дефект кода: **55**
 * Уязвимость: **2**
-* Ошибка: **32**
+* Ошибка: **30**
 * Потенциальная уязвимость: **2**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -24,24 +24,19 @@
 | [CognitiveComplexity](CognitiveComplexity.md) | Когнитивная сложность | Да | Критичный | Дефект кода | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Выполнение запроса в цикле | Да | Критичный | Ошибка | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Цикломатическая сложность | Да | Критичный | Дефект кода | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | Отсутствует проверка признака ОбменДанными.Загрузка в обработчике событий объекта | Да | Критичный | Ошибка | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Удаление элемента при обходе коллекции посредством оператора "Для каждого ... Из ... Цикл" | Да | Важный | Ошибка | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 2f31a4424d4..b22ab4029d5 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **94**
+Total: **89**
 
-* Error: **32**
-* Code smell: **58**
+* Error: **30**
+* Code smell: **55**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -24,24 +24,19 @@ Total: **94**
 | [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
 | [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
 | [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
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 973b4fb13c8..a88716c7949 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
@@ -1,12 +1,12 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://1c-syntax.github.io/bsl-language-server/configuration/parameters-schema.json",
+    "$id": "http://example.com/root.json",
     "type": "object",
-    "title": "BSL Language Server Configuration File. Parameters definition part",
+    "title": "BSL Language Server Configuration File. Diagnostic definition part",
     "definitions": {
         "BeginTransactionBeforeTryCatch": {
             "description": "Violating transaction rules for the 'BeginTransaction' method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -16,7 +16,7 @@
         },
         "CanonicalSpellingKeywords": {
             "description": "Canonical keyword writing",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -26,7 +26,7 @@
         },
         "CodeBlockBeforeSub": {
             "description": "Method definitions must be placed before the module body operators",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -36,7 +36,7 @@
         },
         "CodeOutOfRegion": {
             "description": "Code out of region",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -46,7 +46,7 @@
         },
         "CognitiveComplexity": {
             "description": "Cognitive complexity",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -70,7 +70,7 @@
         },
         "CommentedCode": {
             "description": "Commented out code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -88,7 +88,7 @@
         },
         "CommitTransactionOutsideTryCatch": {
             "description": "Violating transaction rules for the 'CommitTransaction' method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -96,89 +96,9 @@
             "title": "Violating transaction rules for the 'CommitTransaction' method",
             "$id": "#/definitions/CommitTransactionOutsideTryCatch"
         },
-        "CommonModuleAssign": {
-            "description": "CommonModuleAssign",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "CommonModuleAssign",
-            "$id": "#/definitions/CommonModuleAssign"
-        },
-        "CommonModuleNameCached": {
-            "description": "Missed postfix \"Cached\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"Cached\"",
-            "$id": "#/definitions/CommonModuleNameCached"
-        },
-        "CommonModuleNameClient": {
-            "description": "Missed postfix \"Client\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"Client\"",
-            "$id": "#/definitions/CommonModuleNameClient"
-        },
-        "CommonModuleNameClientServer": {
-            "description": "Missed postfix \"ClientServer\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"ClientServer\"",
-            "$id": "#/definitions/CommonModuleNameClientServer"
-        },
-        "CommonModuleNameFullAccess": {
-            "description": "Missed postfix \"FullAccess\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"FullAccess\"",
-            "$id": "#/definitions/CommonModuleNameFullAccess"
-        },
-        "CommonModuleNameGlobal": {
-            "description": "Missed postfix \"Global\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"Global\"",
-            "$id": "#/definitions/CommonModuleNameGlobal"
-        },
-        "CommonModuleNameGlobalClient": {
-            "description": "Global module with postfix \"Client\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Global module with postfix \"Client\"",
-            "$id": "#/definitions/CommonModuleNameGlobalClient"
-        },
-        "CommonModuleNameServerCall": {
-            "description": "Missed postfix \"ServerCall\"",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Missed postfix \"ServerCall\"",
-            "$id": "#/definitions/CommonModuleNameServerCall"
-        },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -188,7 +108,7 @@
         },
         "CompilationDirectiveNeedLess": {
             "description": "Needless compilation directive",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -196,27 +116,9 @@
             "title": "Needless compilation directive",
             "$id": "#/definitions/CompilationDirectiveNeedLess"
         },
-        "ConsecutiveEmptyLines": {
-            "description": "Consecutive empty lines",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Consecutive empty lines",
-            "properties": {
-                "allowedEmptyLinesCount": {
-                    "description": "Maximum allowed consecutive empty lines",
-                    "default": 1,
-                    "type": "integer",
-                    "title": "Maximum allowed consecutive empty lines"
-                }
-            },
-            "$id": "#/definitions/ConsecutiveEmptyLines"
-        },
         "CreateQueryInCycle": {
             "description": "Execution query on cycle",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -226,7 +128,7 @@
         },
         "CyclomaticComplexity": {
             "description": "Cyclomatic complexity",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -248,27 +150,9 @@
             },
             "$id": "#/definitions/CyclomaticComplexity"
         },
-        "DataExchangeLoading": {
-            "description": "There is no check for the attribute DataExchange.Load in the object's event handler",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "There is no check for the attribute DataExchange.Load in the object's event handler",
-            "properties": {
-                "findFirst": {
-                    "description": "Check should go first",
-                    "default": false,
-                    "type": "boolean",
-                    "title": "Check should go first"
-                }
-            },
-            "$id": "#/definitions/DataExchangeLoading"
-        },
         "DeletingCollectionItem": {
             "description": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -276,19 +160,9 @@
             "title": "Deleting an item when iterating through collection using the operator \"For each ... In ... Do\"",
             "$id": "#/definitions/DeletingCollectionItem"
         },
-        "DeprecatedAttributes8312": {
-            "description": "Deprecated 8.3.12 platform features.",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Deprecated 8.3.12 platform features.",
-            "$id": "#/definitions/DeprecatedAttributes8312"
-        },
         "DeprecatedCurrentDate": {
             "description": "Using of the deprecated method \"CurrentDate\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -298,7 +172,7 @@
         },
         "DeprecatedFind": {
             "description": "Using of the deprecated method \"Find\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -308,7 +182,7 @@
         },
         "DeprecatedMessage": {
             "description": "Restriction on the use of deprecated \"Message\" method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -316,19 +190,9 @@
             "title": "Restriction on the use of deprecated \"Message\" method",
             "$id": "#/definitions/DeprecatedMessage"
         },
-        "DeprecatedMethods8310": {
-            "description": "Deprecated client application method.",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Deprecated client application method.",
-            "$id": "#/definitions/DeprecatedMethods8310"
-        },
         "DeprecatedTypeManagedForm": {
             "description": "Deprecated ManagedForm type",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -338,7 +202,7 @@
         },
         "DuplicateRegion": {
             "description": "Duplicate regions",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -348,7 +212,7 @@
         },
         "EmptyCodeBlock": {
             "description": "Empty code block",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -366,7 +230,7 @@
         },
         "EmptyRegion": {
             "description": "The region should not be empty",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -376,7 +240,7 @@
         },
         "EmptyStatement": {
             "description": "Empty statement",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -384,19 +248,9 @@
             "title": "Empty statement",
             "$id": "#/definitions/EmptyStatement"
         },
-        "ExcessiveAutoTestCheck": {
-            "description": "Excessive AutoTest Check",
-            "default": true,
-            "type": [
-                "boolean",
-                "object"
-            ],
-            "title": "Excessive AutoTest Check",
-            "$id": "#/definitions/ExcessiveAutoTestCheck"
-        },
         "ExtraCommas": {
             "description": "Commas without a parameter at the end of a method call",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -406,7 +260,7 @@
         },
         "FormDataToValue": {
             "description": "FormDataToValue method call",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -416,7 +270,7 @@
         },
         "FunctionNameStartsWithGet": {
             "description": "Function name shouldn't start with \"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c\"",
-            "default": false,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -426,7 +280,7 @@
         },
         "FunctionReturnsSamePrimitive": {
             "description": "The function always returns the same primitive value",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -436,7 +290,7 @@
         },
         "FunctionShouldHaveReturn": {
             "description": "The function should have return",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -446,7 +300,7 @@
         },
         "GetFormMethod": {
             "description": "GetForm method call",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -456,7 +310,7 @@
         },
         "IdenticalExpressions": {
             "description": "There are identical sub-expressions to the left and to the right of the \"foo\" operator",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -466,7 +320,7 @@
         },
         "IfConditionComplexity": {
             "description": "Usage of complex expressions in the \"If\" condition",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -484,7 +338,7 @@
         },
         "IfElseDuplicatedCodeBlock": {
             "description": "Duplicated code blocks in If...Then...ElseIf... statements",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -494,7 +348,7 @@
         },
         "IfElseDuplicatedCondition": {
             "description": "Duplicated conditions in If...Then...ElseIf... statements",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -504,7 +358,7 @@
         },
         "IfElseIfEndsWithElse": {
             "description": "Else...The...ElseIf... statement should end with Else branch",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -514,7 +368,7 @@
         },
         "InvalidCharacterInFile": {
             "description": "Invalid character",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -524,7 +378,7 @@
         },
         "LineLength": {
             "description": "Line Length limit",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -542,7 +396,7 @@
         },
         "MagicNumber": {
             "description": "Magic numbers",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -566,7 +420,7 @@
         },
         "MethodSize": {
             "description": "Method size",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -584,7 +438,7 @@
         },
         "MissingCodeTryCatchEx": {
             "description": "Missing code in Raise block in \"Try ... Raise ... EndTry\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -602,7 +456,7 @@
         },
         "MissingSpace": {
             "description": "Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ;",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -644,7 +498,7 @@
         },
         "MissingTemporaryFileDeletion": {
             "description": "Missing temporary file deletion after using",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -662,7 +516,7 @@
         },
         "MissingVariablesDescription": {
             "description": "All variables declarations must have a description",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -672,7 +526,7 @@
         },
         "MultilingualStringHasAllDeclaredLanguages": {
             "description": "There is a localized text for all languages declared in the configuration",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -690,7 +544,7 @@
         },
         "MultilingualStringUsingWithTemplate": {
             "description": "Partially localized text is used in the StrTemplate function",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -708,7 +562,7 @@
         },
         "NestedConstructorsInStructureDeclaration": {
             "description": "Nested constructors with parameters in structure declaration",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -718,7 +572,7 @@
         },
         "NestedFunctionInParameters": {
             "description": "Initialization of method and constructor parameters by calling nested methods",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -728,7 +582,7 @@
         },
         "NestedStatements": {
             "description": "Control flow statements should not be nested too deep",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -746,7 +600,7 @@
         },
         "NestedTernaryOperator": {
             "description": "Nested ternary operator",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -756,7 +610,7 @@
         },
         "NonExportMethodsInApiRegion": {
             "description": "Non export methods in API regions",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -766,7 +620,7 @@
         },
         "NonStandardRegion": {
             "description": "Non-standard region of module",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -776,7 +630,7 @@
         },
         "NumberOfOptionalParams": {
             "description": "Limit number of optional parameters in method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -794,7 +648,7 @@
         },
         "NumberOfParams": {
             "description": "Number of parameters in method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -812,7 +666,7 @@
         },
         "NumberOfValuesInStructureConstructor": {
             "description": "Limit on the number of property values passed to the structure constructor",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -830,7 +684,7 @@
         },
         "OSUsersMethod": {
             "description": "Using method OSUsers",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -840,7 +694,7 @@
         },
         "OneStatementPerLine": {
             "description": "One statement per line",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -850,7 +704,7 @@
         },
         "OrderOfParams": {
             "description": "Order of Parameters in method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -860,7 +714,7 @@
         },
         "PairingBrokenTransaction": {
             "description": "Violation of pairing using methods \"BeginTransaction()\" & \"CommitTransaction()\" / \"RollbackTransaction()\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -870,7 +724,7 @@
         },
         "ParseError": {
             "description": "Source code parse error",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -880,7 +734,7 @@
         },
         "ProcedureReturnsValue": {
             "description": "Procedure should not return Value",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -890,7 +744,7 @@
         },
         "PublicMethodsDescription": {
             "description": "All public methods must have a description",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -908,7 +762,7 @@
         },
         "SelfAssign": {
             "description": "Variable is assigned to itself",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -918,7 +772,7 @@
         },
         "SelfInsertion": {
             "description": "Insert a collection into itself",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -928,7 +782,7 @@
         },
         "SemicolonPresence": {
             "description": "Statement should end with semicolon symbol \";\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -938,7 +792,7 @@
         },
         "SeveralCompilerDirectives": {
             "description": "Erroneous indication of several compilation directives",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -948,7 +802,7 @@
         },
         "SpaceAtStartComment": {
             "description": "Space at the beginning of the comment",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -966,7 +820,7 @@
         },
         "TempFilesDir": {
             "description": "TempFilesDir() method call",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -976,7 +830,7 @@
         },
         "TernaryOperatorUsage": {
             "description": "Ternary operator usage",
-            "default": false,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -986,7 +840,7 @@
         },
         "ThisObjectAssign": {
             "description": "ThisObject assign",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -996,7 +850,7 @@
         },
         "TimeoutsInExternalResources": {
             "description": "Timeouts working with external resources",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1014,7 +868,7 @@
         },
         "TooManyReturns": {
             "description": "Methods should not have too many return statements",
-            "default": false,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1032,7 +886,7 @@
         },
         "TryNumber": {
             "description": "Cast to number of try catch block",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1042,7 +896,7 @@
         },
         "Typo": {
             "description": "Typo",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1050,10 +904,10 @@
             "title": "Typo",
             "properties": {
                 "userWordsToIgnore": {
-                    "description": "Dictionary for excluding words (comma separated, without spaces)",
+                    "description": "Dictionary for excluding words",
                     "default": "",
                     "type": "string",
-                    "title": "Dictionary for excluding words (comma separated, without spaces)"
+                    "title": "Dictionary for excluding words"
                 },
                 "minWordLength": {
                     "description": "Minimum length for checked words",
@@ -1066,7 +920,7 @@
         },
         "UnaryPlusInConcatenation": {
             "description": "Unary Plus sign in string concatenation",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1076,7 +930,7 @@
         },
         "UnknownPreprocessorSymbol": {
             "description": "Unknown preprocessor symbol",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1086,7 +940,7 @@
         },
         "UnreachableCode": {
             "description": "Unreachable Code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1096,7 +950,7 @@
         },
         "UnusedLocalMethod": {
             "description": "Unused local method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1106,7 +960,7 @@
         },
         "UnusedParameters": {
             "description": "Unused parameter",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1116,7 +970,7 @@
         },
         "UseLessForEach": {
             "description": "Useless collection iteration",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1126,7 +980,7 @@
         },
         "UsingCancelParameter": {
             "description": "Using parameter \"Cancel\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1136,7 +990,7 @@
         },
         "UsingExternalCodeTools": {
             "description": "Using external code tools",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1146,7 +1000,7 @@
         },
         "UsingFindElementByString": {
             "description": "Using FindByName and FindByCode",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1156,7 +1010,7 @@
         },
         "UsingGoto": {
             "description": "\"goto\" statement should not be used",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1166,7 +1020,7 @@
         },
         "UsingHardcodeNetworkAddress": {
             "description": "Using hardcode ip addresses in code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1184,7 +1038,7 @@
         },
         "UsingHardcodePath": {
             "description": "Using hardcode file paths in code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1202,7 +1056,7 @@
         },
         "UsingHardcodeSecretInformation": {
             "description": "Storing confidential information in code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1220,7 +1074,7 @@
         },
         "UsingModalWindows": {
             "description": "Using modal windows",
-            "default": false,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1230,7 +1084,7 @@
         },
         "UsingObjectNotAvailableUnix": {
             "description": "Using unavailable in Unix objects",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1240,7 +1094,7 @@
         },
         "UsingServiceTag": {
             "description": "Using service tags",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1258,7 +1112,7 @@
         },
         "UsingSynchronousCalls": {
             "description": "Using synchronous calls",
-            "default": false,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1268,7 +1122,7 @@
         },
         "UsingThisForm": {
             "description": "Using deprecated property \"ThisForm\"",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1278,7 +1132,7 @@
         },
         "WrongUseOfRollbackTransactionMethod": {
             "description": "Not recommended using of RollbackTransaction method",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
@@ -1288,7 +1142,7 @@
         },
         "YoLetterUsage": {
             "description": "Using Russian character \"yo\" (\"\u0451\") in code",
-            "default": true,
+            "default": null,
             "type": [
                 "boolean",
                 "object"
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 dd5960db17f..89009acb5aa 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
@@ -134,6 +134,9 @@
                 "FunctionReturnsSamePrimitive": {
                     "$ref": "parameters-schema.json#/definitions/FunctionReturnsSamePrimitive"
                 },
+                "FunctionReturnsSamePrimitive": {
+                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
+                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },

From 49a71fc9f98dc5ef5100f28f06c41db5722ab952 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 08:59:12 +0700
Subject: [PATCH 203/444] =?UTF-8?q?=D0=98=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 18 ++++++++++++---
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl | 22 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index c0dc94b38af..ba0f48586e9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -38,6 +38,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -54,6 +55,8 @@
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
+  private static final Pattern pattern = Pattern.compile(
+    "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -61,6 +64,17 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
 
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+
+    var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
+      .map(BSLParser.FuncDeclarationContext::subName)
+      .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
+      .isPresent();
+
+    // Исключаем подключаемые методы
+    if (abortCheck) {
+      return ctx;
+    }
+
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
     if (tree.size() > 1) {
       var expressions = tree.stream()
@@ -100,9 +114,7 @@ private void checkPrimitiveValue(
   private Range getSubNameRange(ParserRuleContext ctx) {
     return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
       .map(BSLParser.SubContext.class::cast)
-      .map(context -> documentContext.getSymbolTree().getMethodSymbol(context))
-      .filter(Optional::isPresent)
-      .map(Optional::get)
+      .flatMap(context -> documentContext.getSymbolTree().getMethodSymbol(context))
       .map(MethodSymbol::getSubNameRange)
       .orElse(Ranges.create(ctx.getStart()));
   }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 66f0df2975e..67f0824d2ea 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -48,4 +48,24 @@
         Возврат Значение;
     КонецЕсли;
     Возврат Значение;
-КонецФункции
\ No newline at end of file
+КонецФункции
+
+Функция Подключаемый_КакаяТоКоманда(Команда)
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Неопределено;
+    КонецЕсли;
+
+    Возврат Неопределено;
+
+КонецФункции
+
+Function Attachable_RandomAction(Command)
+
+    If ValueIsFilled(CurrentDate) Then
+        Return Undefined;
+    EndIf;
+
+    Return Undefined;
+
+EndFunction

From 0b712d412880a7757d23eb9e6c303819fad5b28c Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 08:59:21 +0700
Subject: [PATCH 204/444] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=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=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/FunctionReturnsSamePrimitive.md  | 15 +++++++++++++++
 .../diagnostics/FunctionReturnsSamePrimitive.md   | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index cbd70345b65..41eb85dc3d6 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -46,6 +46,21 @@
 КонецПроцедуры
 ```
 
+## Особенности
+
+Из проверки исключаются подключаемые Функции. Например:
+```bsl
+Функция Подключаемый_КакаяТоКоманда(Команда)
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Неопределено;
+    КонецЕсли;
+
+    Возврат Неопределено;
+
+КонецФункции
+```
+
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index a7b5d484497..01ac1e2515f 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -46,6 +46,21 @@ Function CheckString(Val RowTable)
 EndFunction
 ```
 
+## Nuances
+
+Attachable functions excluded from the scan. Example:
+```bsl
+Function Attachable_RandomAction(Command)
+
+    If ValueIsFilled(CurrentDate) Then
+        Return Undefined;
+    EndIf;
+
+    Return Undefined;
+
+EndFunction
+```
+
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников

From 5a099f8a6ae7e2aa98408a9e41f43da917ddc831 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 18:40:34 +0700
Subject: [PATCH 205/444] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=B2=20=D1=80=D0=B0=D0=B7=D0=BD=D1=8B=D1=85=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=85=20(=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20Null=20=D0=B8=20NULL)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java  | 5 ++++-
 .../diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index ba0f48586e9..4f8b6f6e7a6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -97,7 +97,10 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
   private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
-    var set = expressions.stream().map(BSLParser.ExpressionContext::getText).collect(Collectors.toSet());
+    var set = expressions.stream()
+      .map(BSLParser.ExpressionContext::getText)
+      .map(String::toUpperCase)
+      .collect(Collectors.toSet());
     if (set.size() == 1) {
       var relatedInformation = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 67f0824d2ea..b6d68404a02 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -53,10 +53,10 @@
 Функция Подключаемый_КакаяТоКоманда(Команда)
 
     Если ЗначениеЗаполнено(ТекущаяДата) Тогда
-        Возврат Неопределено;
+        Возврат Null;
     КонецЕсли;
 
-    Возврат Неопределено;
+    Возврат NULL;
 
 КонецФункции
 

From dd9ac1d343bb888e9d3400c6e7817da55512c9bc Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Sun, 26 Apr 2020 21:41:13 +0700
Subject: [PATCH 206/444] =?UTF-8?q?=D0=9D=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=20=D0=A1=D1=82=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BA=20=D0=B2=D0=B5=D1=80=D1=85=D0=BD=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=83=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitiveDiagnostic.java    | 10 ++++++++--
 .../FunctionReturnsSamePrimitiveDiagnostic.bsl     | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 4f8b6f6e7a6..5176fc3fb2a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -37,6 +37,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -98,8 +99,13 @@ private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
     var set = expressions.stream()
-      .map(BSLParser.ExpressionContext::getText)
-      .map(String::toUpperCase)
+      .map((BSLParser.ExpressionContext expression) -> {
+        var text = expression.getText();
+        if (Trees.findAllRuleNodes(expression, BSLParser.RULE_string).isEmpty()) {
+          text = text.toUpperCase(Locale.ENGLISH);
+        }
+        return text;
+      })
       .collect(Collectors.toSet());
     if (set.size() == 1) {
       var relatedInformation = tree.stream()
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index b6d68404a02..046db69df92 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -69,3 +69,17 @@ Function Attachable_RandomAction(Command)
     Return Undefined;
 
 EndFunction
+
+// тут нет ошибки
+Функция ПроверкаРегистраДляСтрок()
+
+    Тип = 1;
+    Если Тип = 1 Тогда
+        Возврат "Значение";
+    ИначеЕсли Тип = 2 Тогда
+        Возврат "значение";
+    Иначе
+        Возврат "ЗНАЧЕНИЕ";
+    КонецЕсли;
+
+КонецФункции

From b8a72d89bd9de948f1a034ce7445824bc61620dd Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 00:02:18 +0700
Subject: [PATCH 207/444] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=20"=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D1=8F?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?=
 =?UTF-8?q?"=20=D0=B8=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...unctionReturnsSamePrimitiveDiagnostic.java | 26 +++++++----
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 43 ++++++++++++++-----
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl | 10 +++++
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 5176fc3fb2a..010a338418c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 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.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;
@@ -59,6 +60,14 @@ public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagn
   private static final Pattern pattern = Pattern.compile(
     "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
+  private static final boolean CHECK_ATTACHABLE_METHODS = true;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + CHECK_ATTACHABLE_METHODS
+  )
+  private boolean checkAttachableMethods = CHECK_ATTACHABLE_METHODS;
+
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -66,14 +75,15 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
 
-    var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
-      .map(BSLParser.FuncDeclarationContext::subName)
-      .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
-      .isPresent();
-
-    // Исключаем подключаемые методы
-    if (abortCheck) {
-      return ctx;
+    if (checkAttachableMethods) {
+      // Исключаем подключаемые методы
+      var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
+        .map(BSLParser.FuncDeclarationContext::subName)
+        .filter(subNameContext -> pattern.matcher(subNameContext.getText()).find())
+        .isPresent();
+      if (abortCheck) {
+        return ctx;
+      }
     }
 
     var tree = Trees.findAllRuleNodes(ctx, BSLParser.RULE_returnStatement);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index b4d1a3cd769..7bc3af568ce 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -21,11 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Diagnostic;
 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;
 
@@ -37,16 +37,39 @@ class FunctionReturnsSamePrimitiveDiagnosticTest extends AbstractDiagnosticTest<
   @Test
   void test() {
 
-    List<Diagnostic> diagnostics = getDiagnostics();
+    List<Diagnostic> diagnostics;
+    Map<String, Object> configuration;
 
-  assertThat(diagnostics)
-    .hasSize(3)
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(0, 8, 0, 23)))
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(25, 8, 25, 14)))
-    .anyMatch(diagnostic -> diagnostic.getRange().equals(
-      Ranges.create(35, 8, 35, 17)));
+    // Проверяем срабатывания с параметрами по умолчанию
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(4)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(62, 8, 22);
+
+    // Проверяем с выключенным параметром checkAttachableMethods
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("checkAttachableMethods", false);
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(6)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(52, 8, 35)
+      .hasRange(62, 8, 22)
+      .hasRange(72, 9, 32);
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index 046db69df92..d2d1c8ca1ce 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -60,6 +60,16 @@
 
 КонецФункции
 
+Функция КакаяТоКоманда(Команда) // <- ошибка
+
+    Если ЗначениеЗаполнено(ТекущаяДата) Тогда
+        Возврат Null;
+    КонецЕсли;
+
+    Возврат NULL;
+
+КонецФункции
+
 Function Attachable_RandomAction(Command)
 
     If ValueIsFilled(CurrentDate) Then

From b958bba32910c74c2a195f7aebcb90be03c119d4 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 00:03:01 +0700
Subject: [PATCH 208/444] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/FunctionReturnsSamePrimitive.md       | 10 +++++++++-
 docs/en/diagnostics/FunctionReturnsSamePrimitive.md    | 10 +++++++++-
 .../configuration/parameters-schema.json               |  8 ++++++++
 .../bsl/languageserver/configuration/schema.json       |  3 ---
 ...unctionReturnsSamePrimitiveDiagnostic_en.properties |  1 +
 ...unctionReturnsSamePrimitiveDiagnostic_ru.properties |  1 +
 6 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 41eb85dc3d6..03bc179021a 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -4,6 +4,12 @@
 | :-: | :-: | :-: | :-: | :-: | :-: |
 | `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `design`<br/>`badpractice` |
 
+## Параметры 
+
+| Имя | Тип | Описание | Значение по умолчанию |
+| :-: | :-: | :-- | :-: |
+| `checkAttachableMethods` | `Булево` | ```Проверять подключаемые методы``` | ```true``` |
+
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -82,5 +88,7 @@
 ### Параметр конфигурационного файла
 
 ```json
-"FunctionReturnsSamePrimitive": false
+"FunctionReturnsSamePrimitive": {
+    "checkAttachableMethods": true
+}
 ```
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index 01ac1e2515f..d78f5bf2663 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -4,6 +4,12 @@
 | :-: | :-: | :-: | :-: | :-: | :-: |
 | `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `design`<br/>`badpractice` |
 
+## Parameters 
+
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `checkAttachableMethods` | `Boolean` | ```Check attachable methods``` | ```true``` |
+
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -82,5 +88,7 @@ EndFunction
 ### Parameter for config
 
 ```json
-"FunctionReturnsSamePrimitive": false
+"FunctionReturnsSamePrimitive": {
+    "checkAttachableMethods": true
+}
 ```
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 a88716c7949..e956f5b9869 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
@@ -286,6 +286,14 @@
                 "object"
             ],
             "title": "The function always returns the same primitive value",
+            "properties": {
+                "checkAttachableMethods": {
+                    "description": "Check attachable methods",
+                    "default": true,
+                    "type": "boolean",
+                    "title": "Check attachable methods"
+                }
+            },
             "$id": "#/definitions/FunctionReturnsSamePrimitive"
         },
         "FunctionShouldHaveReturn": {
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 89009acb5aa..dd5960db17f 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
@@ -134,9 +134,6 @@
                 "FunctionReturnsSamePrimitive": {
                     "$ref": "parameters-schema.json#/definitions/FunctionReturnsSamePrimitive"
                 },
-                "FunctionReturnsSamePrimitive": {
-                    "$ref": "diagnostics-schema.json#/definitions/FunctionReturnsSamePrimitive"
-                },
                 "FunctionShouldHaveReturn": {
                     "$ref": "parameters-schema.json#/definitions/FunctionShouldHaveReturn"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index fb0ac7ddbfc..d7f0db77485 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,3 +1,4 @@
 diagnosticMessage=Check that the same primitive value is returned in the function
 diagnosticName=The function always returns the same primitive value
 diagnosticMessageReturnStatement=Repeat return value
+checkAttachableMethods=Check attachable methods
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index 2ac2ec79e1b..3143159f75c 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,3 +1,4 @@
 diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
 diagnosticName=Функция всегда возвращает одно и то же примитивное значение
 diagnosticMessageReturnStatement=Повтор возвращаемого значения
+checkAttachableMethods=Проверять подключаемые методы

From 864f769df51150ef4fd28ec43c554f99ec5f8192 Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 10:38:29 +0700
Subject: [PATCH 209/444] =?UTF-8?q?=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D1=82=D1=80=D0=BE=D0=BA,=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B9=D0=BC=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D0=BC,=20=D1=80=D0=B0=D1=81=D1=88=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FunctionReturnsSamePrimitive.md           |  6 ++-
 .../FunctionReturnsSamePrimitive.md           |  6 ++-
 ...unctionReturnsSamePrimitiveDiagnostic.java | 40 ++++++++++++-------
 .../configuration/parameters-schema.json      | 12 ++++--
 ...turnsSamePrimitiveDiagnostic_en.properties |  3 +-
 ...turnsSamePrimitiveDiagnostic_ru.properties |  3 +-
 ...ionReturnsSamePrimitiveDiagnosticTest.java | 29 +++++++++++---
 ...FunctionReturnsSamePrimitiveDiagnostic.bsl |  7 ++--
 8 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index 03bc179021a..fe18bf533df 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -8,7 +8,8 @@
 
 | Имя | Тип | Описание | Значение по умолчанию |
 | :-: | :-: | :-- | :-: |
-| `checkAttachableMethods` | `Булево` | ```Проверять подключаемые методы``` | ```true``` |
+| `skipAttachable` | `Булево` | ```Не учитывать подключаемые методы``` | ```true``` |
+| `caseSensitiveForString` | `Булево` | ```Учитывать регистр в строковых значениях``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -89,6 +90,7 @@
 
 ```json
 "FunctionReturnsSamePrimitive": {
-    "checkAttachableMethods": true
+    "skipAttachable": true,
+    "caseSensitiveForString": false
 }
 ```
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index d78f5bf2663..b51a70af555 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -8,7 +8,8 @@
 
 | Name | Type | Description | Default value |
 | :-: | :-: | :-- | :-: |
-| `checkAttachableMethods` | `Boolean` | ```Check attachable methods``` | ```true``` |
+| `skipAttachable` | `Boolean` | ```Ignore attachable methods``` | ```true``` |
+| `caseSensitiveForString` | `Boolean` | ```Case sensitive for strings``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -89,6 +90,7 @@ EndFunction
 
 ```json
 "FunctionReturnsSamePrimitive": {
-    "checkAttachableMethods": true
+    "skipAttachable": true,
+    "caseSensitiveForString": false
 }
 ```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 010a338418c..0f6f2e754ae 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -60,13 +60,20 @@ public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagn
   private static final Pattern pattern = Pattern.compile(
     "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
-  private static final boolean CHECK_ATTACHABLE_METHODS = true;
+  private static final boolean SKIP_ATTACHABLE = true;
+  private static final boolean CASE_SENSITIVE_FOR_STRING = false;
 
   @DiagnosticParameter(
     type = Boolean.class,
-    defaultValue = "" + CHECK_ATTACHABLE_METHODS
+    defaultValue = "" + SKIP_ATTACHABLE
   )
-  private boolean checkAttachableMethods = CHECK_ATTACHABLE_METHODS;
+  private boolean skipAttachable = SKIP_ATTACHABLE;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + CASE_SENSITIVE_FOR_STRING
+  )
+  private boolean caseSensitiveForString = CASE_SENSITIVE_FOR_STRING;
 
   public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -75,7 +82,7 @@ public FunctionReturnsSamePrimitiveDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
 
-    if (checkAttachableMethods) {
+    if (skipAttachable) {
       // Исключаем подключаемые методы
       var abortCheck = Optional.ofNullable(ctx.funcDeclaration())
         .map(BSLParser.FuncDeclarationContext::subName)
@@ -108,16 +115,12 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
   private void checkPrimitiveValue(
     BSLParser.FunctionContext ctx, Collection<ParseTree> tree, List<BSLParser.ExpressionContext> expressions) {
 
-    var set = expressions.stream()
-      .map((BSLParser.ExpressionContext expression) -> {
-        var text = expression.getText();
-        if (Trees.findAllRuleNodes(expression, BSLParser.RULE_string).isEmpty()) {
-          text = text.toUpperCase(Locale.ENGLISH);
-        }
-        return text;
-      })
-      .collect(Collectors.toSet());
-    if (set.size() == 1) {
+    var count = expressions.stream()
+      .map(this::getExpressionText)
+      .distinct()
+      .count();
+
+    if (count == 1) {
       var relatedInformation = tree.stream()
         .map(BSLParser.ReturnStatementContext.class::cast)
         .map(statement -> RelatedInformation.create(
@@ -125,11 +128,18 @@ private void checkPrimitiveValue(
           Ranges.create(statement.getStart()),
           info.getResourceString(KEY_MESSAGE)))
         .collect(Collectors.toList());
-      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), info.getMessage(), relatedInformation);
+      diagnosticStorage.addDiagnostic(getSubNameRange(ctx), relatedInformation);
     }
 
   }
 
+  private String getExpressionText(BSLParser.ExpressionContext expression) {
+    if (caseSensitiveForString && Trees.nodeContains(expression, BSLParser.RULE_string)) {
+      return expression.getText();
+    }
+    return expression.getText().toUpperCase(Locale.ENGLISH);
+  }
+
   private Range getSubNameRange(ParserRuleContext ctx) {
     return Optional.ofNullable(Trees.getAncestorByRuleIndex(ctx, BSLParser.RULE_sub))
       .map(BSLParser.SubContext.class::cast)
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 e956f5b9869..5a73d19b09b 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
@@ -287,11 +287,17 @@
             ],
             "title": "The function always returns the same primitive value",
             "properties": {
-                "checkAttachableMethods": {
-                    "description": "Check attachable methods",
+                "skipAttachable": {
+                    "description": "Ignore attachable methods",
                     "default": true,
                     "type": "boolean",
-                    "title": "Check attachable methods"
+                    "title": "Ignore attachable methods"
+                },
+                "caseSensitiveForString": {
+                    "description": "Case sensitive for strings",
+                    "default": false,
+                    "type": "boolean",
+                    "title": "Case sensitive for strings"
                 }
             },
             "$id": "#/definitions/FunctionReturnsSamePrimitive"
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
index d7f0db77485..4be88d7f729 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_en.properties
@@ -1,4 +1,5 @@
 diagnosticMessage=Check that the same primitive value is returned in the function
 diagnosticName=The function always returns the same primitive value
 diagnosticMessageReturnStatement=Repeat return value
-checkAttachableMethods=Check attachable methods
+skipAttachable=Ignore attachable methods
+caseSensitiveForString=Case sensitive for strings
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
index 3143159f75c..eadc148c869 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic_ru.properties
@@ -1,4 +1,5 @@
 diagnosticMessage=Проверьте правильность возврата одного и того же примитивного значения в функции
 diagnosticName=Функция всегда возвращает одно и то же примитивное значение
 diagnosticMessageReturnStatement=Повтор возвращаемого значения
-checkAttachableMethods=Проверять подключаемые методы
+skipAttachable=Не учитывать подключаемые методы
+caseSensitiveForString=Учитывать регистр в строковых значениях
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
index 7bc3af568ce..00fd8cafb34 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnosticTest.java
@@ -48,28 +48,45 @@ void test() {
 
     // then
     assertThat(diagnostics, true)
-      .hasSize(4)
+      .hasSize(5)
       .hasRange(0, 8, 23)
       .hasRange(25, 8, 14)
       .hasRange(35, 8, 17)
-      .hasRange(62, 8, 22);
+      .hasRange(62, 8, 22)
+      .hasRange(82, 8, 32);
 
-    // Проверяем с выключенным параметром checkAttachableMethods
+    // Проверяем с выключенным параметром skipAttachable
     // when
     configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
-    configuration.put("checkAttachableMethods", false);
+    configuration.put("skipAttachable", false);
     diagnosticInstance.configure(configuration);
     diagnostics = getDiagnostics();
 
     // then
     assertThat(diagnostics, true)
-      .hasSize(6)
+      .hasSize(7)
       .hasRange(0, 8, 23)
       .hasRange(25, 8, 14)
       .hasRange(35, 8, 17)
       .hasRange(52, 8, 35)
       .hasRange(62, 8, 22)
-      .hasRange(72, 9, 32);
+      .hasRange(72, 9, 32)
+      .hasRange(82, 8, 32);
+
+    // Проверяем с включенным параметром caseSensitiveForString
+    // when
+    configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("caseSensitiveForString", true);
+    diagnosticInstance.configure(configuration);
+    diagnostics = getDiagnostics();
+
+    // then
+    assertThat(diagnostics, true)
+      .hasSize(4)
+      .hasRange(0, 8, 23)
+      .hasRange(25, 8, 14)
+      .hasRange(35, 8, 17)
+      .hasRange(62, 8, 22);
 
   }
 }
diff --git a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
index d2d1c8ca1ce..df2cf3995b3 100644
--- a/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
+++ b/src/test/resources/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.bsl
@@ -50,7 +50,7 @@
     Возврат Значение;
 КонецФункции
 
-Функция Подключаемый_КакаяТоКоманда(Команда)
+Функция Подключаемый_КакаяТоКоманда(Команда) // <- ошибки (опционально)
 
     Если ЗначениеЗаполнено(ТекущаяДата) Тогда
         Возврат Null;
@@ -70,7 +70,7 @@
 
 КонецФункции
 
-Function Attachable_RandomAction(Command)
+Function Attachable_RandomAction(Command) // <- ошибки (опционально)
 
     If ValueIsFilled(CurrentDate) Then
         Return Undefined;
@@ -80,8 +80,7 @@ Function Attachable_RandomAction(Command)
 
 EndFunction
 
-// тут нет ошибки
-Функция ПроверкаРегистраДляСтрок()
+Функция ПроверкаРегистраДляСтрок() // <- ошибки (опционально)
 
     Тип = 1;
     Если Тип = 1 Тогда

From 44b704ea4cbe07b7784cd36fa534f17ca753ed2b Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Tue, 28 Apr 2020 13:31:09 +0700
Subject: [PATCH 210/444] =?UTF-8?q?=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20precommit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/index.md                     | 13 +++-
 docs/en/diagnostics/index.md                  | 14 +++-
 .../configuration/parameters-schema.json      | 70 +++++++++++++++++++
 3 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 6b75e3691b3..208bf744d25 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,12 +8,12 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **94**
+Общее количество: **102**
 
-* Дефект кода: **59**
+* Дефект кода: **65**
 * Уязвимость: **2**
 * Ошибка: **32**
-* Потенциальная уязвимость: **2**
+* Потенциальная уязвимость: **3**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
 | --- | --- | :-: | --- | --- | --- |
@@ -25,6 +25,13 @@
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
+| [CommonModuleNameCached](CommonModuleNameCached.md) | Пропущен постфикс "ПовтИсп" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClient](CommonModuleNameClient.md) | Пропущен постфикс "Клиент" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Пропущен постфикс "КлиентСервер" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Пропущен постфикс "ПолныеПрава" | Да | Важный | Потенциальная уязвимость | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Пропущен постфикс "Глобальный" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`brainoverload` |
+| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Глобальный модуль с постфиксом "Клиент" | Да | Важный | Дефект кода | `standard` |
+| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Пропущен постфикс "ВызовСервера" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index e72223b389b..5ece9f38a77 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,11 +8,12 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **94**
+Total: **102**
+
 * Error: **32**
-* Code smell: **59**
+* Code smell: **65**
 * Vulnerability: **2**
-* Security Hotspot: **2**
+* Security Hotspot: **3**
 
 | Key | Name| Enabled by default | Severity | Type | Tags |
 | --- | --- | :-: | --- | --- | --- |
@@ -24,6 +25,13 @@ Total: **94**
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
+| [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
+| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
+| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
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 2c6ba1dd70d..3b2b537e167 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
@@ -106,6 +106,76 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleNameCached": {
+            "description": "Missed postfix \"Cached\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Cached\"",
+            "$id": "#/definitions/CommonModuleNameCached"
+        },
+        "CommonModuleNameClient": {
+            "description": "Missed postfix \"Client\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Client\"",
+            "$id": "#/definitions/CommonModuleNameClient"
+        },
+        "CommonModuleNameClientServer": {
+            "description": "Missed postfix \"ClientServer\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"ClientServer\"",
+            "$id": "#/definitions/CommonModuleNameClientServer"
+        },
+        "CommonModuleNameFullAccess": {
+            "description": "Missed postfix \"FullAccess\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"FullAccess\"",
+            "$id": "#/definitions/CommonModuleNameFullAccess"
+        },
+        "CommonModuleNameGlobal": {
+            "description": "Missed postfix \"Global\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"Global\"",
+            "$id": "#/definitions/CommonModuleNameGlobal"
+        },
+        "CommonModuleNameGlobalClient": {
+            "description": "Global module with postfix \"Client\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Global module with postfix \"Client\"",
+            "$id": "#/definitions/CommonModuleNameGlobalClient"
+        },
+        "CommonModuleNameServerCall": {
+            "description": "Missed postfix \"ServerCall\"",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Missed postfix \"ServerCall\"",
+            "$id": "#/definitions/CommonModuleNameServerCall"
+        },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
             "default": true,

From 90d7637f654b34b172959ee1bd6cc069c08680f7 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Tue, 28 Apr 2020 10:57:03 +0300
Subject: [PATCH 211/444] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0:?=
 =?UTF-8?q?=20=D0=97=D0=B0=D0=BF=D1=80=D0=B5=D1=82=20=D0=BD=D0=B0=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=A0=D0=BE=D0=BB=D1=8C=D0=94=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=83=D0=BF=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/IsInRoleMethodDiagnostic.md  |  49 ++++++
 .../diagnostics/IsInRoleMethodDiagnostic.md   |  49 ++++++
 .../IsInRoleMethodDiagnosticDiagnostic.java   | 140 ++++++++++++++++++
 ...leMethodDiagnosticDiagnostic_en.properties |   2 +
 ...leMethodDiagnosticDiagnostic_ru.properties |   2 +
 ...sInRoleMethodDiagnosticDiagnosticTest.java |  26 ++++
 .../IsInRoleMethodDiagnosticDiagnostic.bsl    |  41 +++++
 7 files changed, 309 insertions(+)
 create mode 100644 docs/diagnostics/IsInRoleMethodDiagnostic.md
 create mode 100644 docs/en/diagnostics/IsInRoleMethodDiagnostic.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/IsInRoleMethodDiagnosticDiagnostic.bsl

diff --git a/docs/diagnostics/IsInRoleMethodDiagnostic.md b/docs/diagnostics/IsInRoleMethodDiagnostic.md
new file mode 100644
index 00000000000..899e854b314
--- /dev/null
+++ b/docs/diagnostics/IsInRoleMethodDiagnostic.md
@@ -0,0 +1,49 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+Для проверки прав доступа в коде следует использовать метод ПравоДоступа.
+
+В тех случаях, где роль не дает никаких прав на объекты метаданных, а служит только для определения того или иного дополнительного права, 
+следует использовать метод РольДоступна. При использовании в конфигурации Библиотеки стандартных подсистем (БСП) следует 
+использовать функцию РолиДоступны общего модуля Пользователи.
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+```
+Неправильно:
+Если РольДоступна("ДобавлениеИзменениеСтранМира") Тогда ...
+Если РольДоступна("ПросмотрОтчетаПопулярныеСтраны") Тогда
+```
+```
+Правильно:
+Если ПравоДоступа("Редактирование", Метаданные.Справочники.СтраныМира) Тогда ...
+Если ПравоДоступа("Просмотр", Метаданные.Отчеты.ПопулярныеСтраны) Тогда ...
+```
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+* Источник: [Стандарт: Проверка прав доступа](https://its.1c.ru/db/v8std#content:737:hdoc)
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
new file mode 100644
index 00000000000..d2c5089cd87
--- /dev/null
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -0,0 +1,49 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+To check access rights in the code, use the AccessRight method.
+
+When a role does not grant access rights to metadata objects and defines an additional access right only, 
+use the IsInRole method. If Standard Subsystems Library is used in a configuration,
+use the RolesAvailable function of the Users common module.
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+```
+Incorrect:
+If IsInRole("AddChangeWorldCountries") Then ...
+If IsInRole("ViewPopularCountriesReport") Then ...
+```
+```
+Correct example:
+If AccessRight("Edit", Metadata.Catalogs.WorldCountries) Then ...
+If AccessRight("View", Metadata.Reports.PopularCountries) Then ...
+```
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+Source: [Standard: Checking access rights](https://support.1ci.com/hc/en-us/articles/360011003180-Checking-access-rights)
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
new file mode 100644
index 00000000000..6b4d7cf73b0
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
@@ -0,0 +1,140 @@
+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.DiagnosticScope;
+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.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.ERROR
+  }
+
+)
+public class IsInRoleMethodDiagnosticDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final HashSet<String> IS_IN_ROLE_VARS = new HashSet<>();
+  private static final HashSet<String> PRIVILEGED_MODE_NAME_VARS = new HashSet<>();
+
+  private static final Pattern IS_IN_ROLE_NAME_PATTERN = Pattern.compile(
+    "(РольДоступна|IsInRole)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  private static final Pattern PRIVILEGED_MODE_NAME_PATTERN = Pattern.compile(
+    "(PrivilegedMode|ПривилегированныйРежим)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public IsInRoleMethodDiagnosticDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitIfBranch(BSLParser.IfBranchContext ctx) {
+    Collection<ParseTree> listIdentifier = Trees.findAllRuleNodes(ctx, BSLParser.RULE_complexIdentifier);
+
+    if (listIdentifier.isEmpty()) {
+      return super.visitIfBranch(ctx);
+    }
+
+    listIdentifier.stream().map(complexCtx -> (BSLParser.ComplexIdentifierContext)complexCtx)
+      .filter(complexCtx -> IS_IN_ROLE_VARS.contains(complexCtx.getText()))
+      .filter(IsInRoleMethodDiagnosticDiagnostic::checkStatement)
+      .forEach(diagnosticStorage::addDiagnostic);
+
+    return super.visitIfBranch(ctx);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+
+    if (IS_IN_ROLE_NAME_PATTERN.matcher(ctx.methodName().getText()).matches()) {
+      handleIsInRoleGlobalMethod(ctx);
+    } else if (PRIVILEGED_MODE_NAME_PATTERN.matcher(ctx.methodName().getText()).matches()) {
+      handlePrivilegedModeGlobalMethod(ctx);
+    } else {
+      return super.visitGlobalMethodCall(ctx);
+    }
+
+    return super.visitGlobalMethodCall(ctx);
+  }
+
+  private void handleIsInRoleGlobalMethod(BSLParser.GlobalMethodCallContext ctx) {
+    var ifStatementNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
+    if (ifStatementNode != null && checkStatement(ctx)) {
+      diagnosticStorage.addDiagnostic(ctx);
+    }
+
+    var assignmentNode = Trees.getRootParent(ctx, BSLParser.RULE_assignment);
+    if (assignmentNode != null) {
+      var childNodes = Trees.getChildren(assignmentNode, BSLParser.RULE_lValue);
+      if (!childNodes.isEmpty()) {
+        IS_IN_ROLE_VARS.add(childNodes.get(0).getText());
+      }
+    }
+  }
+
+  private static void handlePrivilegedModeGlobalMethod(BSLParser.GlobalMethodCallContext ctx) {
+    var assignmentNode = Trees.getRootParent(ctx, BSLParser.RULE_assignment);
+    if (assignmentNode != null) {
+      var childNodes = Trees.getChildren(assignmentNode, BSLParser.RULE_lValue);
+      if (!childNodes.isEmpty()) {
+        PRIVILEGED_MODE_NAME_VARS.add(childNodes.get(0).getText());
+      }
+    }
+  }
+
+  @Override
+  public ParseTree visitAssignment(BSLParser.AssignmentContext ctx) {
+    var childNodes = Trees.getChildren(ctx, BSLParser.RULE_lValue);
+
+    if (!childNodes.isEmpty()) {
+      IS_IN_ROLE_VARS.remove(childNodes.get(0).getText());
+      PRIVILEGED_MODE_NAME_VARS.remove(childNodes.get(0).getText());
+    }
+    return super.visitAssignment(ctx);
+  }
+
+  private static boolean checkStatement(BSLParserRuleContext ctx) {
+    var parentExpression = Trees.getRootParent(ctx, BSLParser.RULE_expression);
+
+    if (parentExpression == null) {
+      return false;
+    }
+
+    boolean hasPrivilegedModeCheck = false;
+
+    var identifierList = Trees.findAllRuleNodes(parentExpression, BSLParser.RULE_complexIdentifier);
+    for (ParseTree parseTree : identifierList) {
+      if (PRIVILEGED_MODE_NAME_VARS.contains(parseTree.getText())) {
+        hasPrivilegedModeCheck = true;
+      }
+    }
+
+    if (!hasPrivilegedModeCheck) {
+      var nextGlobalMethodNode = Trees.getNextNode(parentExpression,
+        ctx, BSLParser.RULE_globalMethodCall);
+
+      hasPrivilegedModeCheck = (nextGlobalMethodNode instanceof BSLParser.GlobalMethodCallContext
+        && PRIVILEGED_MODE_NAME_PATTERN.matcher(((BSLParser.GlobalMethodCallContext) nextGlobalMethodNode)
+        .methodName().getText()).matches());
+    }
+
+    return !hasPrivilegedModeCheck;
+  }
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_en.properties
new file mode 100644
index 00000000000..4ca127c1b8a
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=To check access rights, use AccessRight global method instead.
+diagnosticName=IsInRole global method call
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_ru.properties
new file mode 100644
index 00000000000..1eef4829c69
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Для проверки прав доступа в коде следует использовать метод ПравоДоступа
+diagnosticName=Использование метода РольДоступна
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
new file mode 100644
index 00000000000..7ca610525ea
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
@@ -0,0 +1,26 @@
+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 IsInRoleMethodDiagnosticDiagnosticTest extends AbstractDiagnosticTest<IsInRoleMethodDiagnosticDiagnostic> {
+  IsInRoleMethodDiagnosticDiagnosticTest() {
+    super(IsInRoleMethodDiagnosticDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(32, 9, 32, 35)
+      .hasRange(38, 9, 38, 23);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/IsInRoleMethodDiagnosticDiagnostic.bsl b/src/test/resources/diagnostics/IsInRoleMethodDiagnosticDiagnostic.bsl
new file mode 100644
index 00000000000..418c57f0a01
--- /dev/null
+++ b/src/test/resources/diagnostics/IsInRoleMethodDiagnosticDiagnostic.bsl
@@ -0,0 +1,41 @@
+Процедура Тест()
+    ДоступРазрешен = РольДоступна("НужнаяРоль");
+    ПР = ПривилегированныйРежим();
+    Если ДоступРазрешен ИЛИ ПР Тогда // Нет срабатывания. Есть проверка на привилегированный режим
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест()
+    Если РольДоступна("НужнаяРоль") ИЛИ ПривилегированныйРежим() Тогда // Нет срабатывания. Есть проверка на привилегированный режим
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест()
+    ДоступРазрешен = РольДоступна("НужнаяРоль");
+    Если ДоступРазрешен ИЛИ ПривилегированныйРежим() Тогда // Нет срабатывания. Есть проверка на привилегированный режим
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест()
+    ПР = ПривилегированныйРежим();
+    Если РольДоступна("НужнаяРоль") ИЛИ ПР Тогда // Нет срабатывания. Есть проверка на привилегированный режим
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест()
+    ДоступРазрешен = РольДоступна("НужнаяРоль");
+    ДоступРазрешен = ПР();
+    Если ДоступРазрешен Тогда // Нет срабатывания
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест2()
+    Если РольДоступна("НужнаяРоль") Тогда // Срабатывание
+    КонецЕсли;
+КонецПроцедуры
+
+Процедура Тест3()
+    ДоступРазрешен = РольДоступна("НужнаяРоль");
+    Если ДоступРазрешен Тогда // Срабатывание
+    КонецЕсли;
+КонецПроцедуры
\ No newline at end of file

From 3e68651ba84fb7f5967312e35267b5babbe03129 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Tue, 28 Apr 2020 10:59:26 +0300
Subject: [PATCH 212/444] Precommit

---
 docs/diagnostics/IsInRoleMethodDiagnostic.md  | 19 +++++++++--------
 docs/diagnostics/index.md                     |  5 +++--
 .../diagnostics/IsInRoleMethodDiagnostic.md   | 17 ++++++++-------
 docs/en/diagnostics/index.md                  |  5 +++--
 .../IsInRoleMethodDiagnosticDiagnostic.java   | 21 +++++++++++++++++++
 .../configuration/parameters-schema.json      | 10 +++++++++
 .../languageserver/configuration/schema.json  |  3 +++
 ...sInRoleMethodDiagnosticDiagnosticTest.java | 21 +++++++++++++++++++
 8 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/docs/diagnostics/IsInRoleMethodDiagnostic.md b/docs/diagnostics/IsInRoleMethodDiagnostic.md
index 899e854b314..677453d4f2a 100644
--- a/docs/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/diagnostics/IsInRoleMethodDiagnostic.md
@@ -1,8 +1,8 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Использование метода РольДоступна (IsInRoleMethodDiagnostic)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -32,18 +32,19 @@
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Источник: [Стандарт: Проверка прав доступа](https://its.1c.ru/db/v8std#content:737:hdoc)
+
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:IsInRoleMethodDiagnostic-off
+// BSLLS:IsInRoleMethodDiagnostic-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"IsInRoleMethodDiagnostic": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 784ac601b59..c25a32883be 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **94**
+Общее количество: **95**
 
-* Дефект кода: **59**
+* Дефект кода: **60**
 * Уязвимость: **2**
 * Ошибка: **31**
 * Потенциальная уязвимость: **2**
@@ -54,6 +54,7 @@
 | [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Повторяющиеся условия в синтаксической конструкции Если...Тогда...ИначеЕсли... | Да | Важный | Дефект кода | `suspicious` |
 | [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Использование синтаксической конструкции Если...Тогда...ИначеЕсли... | Да | Важный | Дефект кода | `badpractice` |
 | [InvalidCharacterInFile](InvalidCharacterInFile.md) | Недопустимый символ | Да | Важный | Ошибка | `error`<br/>`standard`<br/>`unpredictable` |
+| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | Использование метода РольДоступна | Да | Важный | Дефект кода | `error` |
 | [LineLength](LineLength.md) | Ограничение на длину строки | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [MagicNumber](MagicNumber.md) | Магические числа | Да | Незначительный | Дефект кода | `badpractice` |
 | [MethodSize](MethodSize.md) | Ограничение на размер метода | Да | Важный | Дефект кода | `badpractice` |
diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index d2c5089cd87..d73b1abb148 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -1,8 +1,8 @@
-# <Diagnostic name>
+# IsInRole global method call (IsInRoleMethodDiagnostic)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -32,18 +32,19 @@ If AccessRight("View", Metadata.Reports.PopularCountries) Then ...
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Standard: Checking access rights](https://support.1ci.com/hc/en-us/articles/360011003180-Checking-access-rights)
+
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:IsInRoleMethodDiagnostic-off
+// BSLLS:IsInRoleMethodDiagnostic-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"IsInRoleMethodDiagnostic": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 5088bbd207c..a17781c9e67 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **94**
+Total: **95**
 
 * Error: **31**
-* Code smell: **59**
+* Code smell: **60**
 * Vulnerability: **2**
 * Security Hotspot: **2**
 
@@ -54,6 +54,7 @@ Total: **94**
 | [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious` |
 | [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice` |
 | [InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br/>`standard`<br/>`unpredictable` |
+| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error` |
 | [LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` |
 | [MethodSize](MethodSize.md) | Method size | Yes | Major | Code smell | `badpractice` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
index 6b4d7cf73b0..addd9295213 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
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 a6dcbbd3085..276c3af0aa6 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
@@ -442,6 +442,16 @@
             "title": "Invalid character",
             "$id": "#/definitions/InvalidCharacterInFile"
         },
+        "IsInRoleMethodDiagnostic": {
+            "description": "IsInRole global method call",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "IsInRole global method call",
+            "$id": "#/definitions/IsInRoleMethodDiagnostic"
+        },
         "LineLength": {
             "description": "Line Length limit",
             "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 20141ed863e..5cb876b7d78 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
@@ -134,6 +134,9 @@
                 "InvalidCharacterInFile": {
                     "$ref": "parameters-schema.json#/definitions/InvalidCharacterInFile"
                 },
+                "IsInRoleMethodDiagnostic": {
+                    "$ref": "parameters-schema.json#/definitions/IsInRoleMethodDiagnostic"
+                },
                 "LineLength": {
                     "$ref": "parameters-schema.json#/definitions/LineLength"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
index 7ca610525ea..fe9cc1ed484 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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 b85be9bf9b694d90e31c55afd77d2e594e0bbda7 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Tue, 28 Apr 2020 11:08:56 +0300
Subject: [PATCH 213/444] Precommit.

---
 docs/diagnostics/index.md    | 5 +++--
 docs/en/diagnostics/index.md | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 208bf744d25..4ac56f2beda 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **102**
+Общее количество: **103**
 
-* Дефект кода: **65**
+* Дефект кода: **66**
 * Уязвимость: **2**
 * Ошибка: **32**
 * Потенциальная уязвимость: **3**
@@ -62,6 +62,7 @@
 | [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Повторяющиеся условия в синтаксической конструкции Если...Тогда...ИначеЕсли... | Да | Важный | Дефект кода | `suspicious` |
 | [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Использование синтаксической конструкции Если...Тогда...ИначеЕсли... | Да | Важный | Дефект кода | `badpractice` |
 | [InvalidCharacterInFile](InvalidCharacterInFile.md) | Недопустимый символ | Да | Важный | Ошибка | `error`<br/>`standard`<br/>`unpredictable` |
+| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | Использование метода РольДоступна | Да | Важный | Дефект кода | `error` |
 | [LineLength](LineLength.md) | Ограничение на длину строки | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [MagicNumber](MagicNumber.md) | Магические числа | Да | Незначительный | Дефект кода | `badpractice` |
 | [MethodSize](MethodSize.md) | Ограничение на размер метода | Да | Важный | Дефект кода | `badpractice` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 5ece9f38a77..ed79ba2b9a8 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **102**
+Total: **103**
 
 * Error: **32**
-* Code smell: **65**
+* Code smell: **66**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
@@ -62,6 +62,7 @@ Total: **102**
 | [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious` |
 | [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice` |
 | [InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br/>`standard`<br/>`unpredictable` |
+| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error` |
 | [LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` |
 | [MethodSize](MethodSize.md) | Method size | Yes | Major | Code smell | `badpractice` |

From f44f01ea5452ae30c5f1fd3f02acb8c0186e665d Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 12:36:05 +0300
Subject: [PATCH 214/444] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8:=208.3.17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/metadata/DiagnosticCompatibilityMode.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
index f3189bcec57..19e937906ea 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticCompatibilityMode.java
@@ -43,7 +43,8 @@ public enum DiagnosticCompatibilityMode {
   COMPATIBILITY_MODE_8_3_13(3, 13),
   COMPATIBILITY_MODE_8_3_14(3, 14),
   COMPATIBILITY_MODE_8_3_15(3, 15),
-  COMPATIBILITY_MODE_8_3_16(3, 16);
+  COMPATIBILITY_MODE_8_3_16(3, 16),
+  COMPATIBILITY_MODE_8_3_17(3, 17);
 
   private final CompatibilityMode compatibilityMode;
 

From de3ce698839704f888c104f41dc385e62f9f73d1 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 15:11:47 +0300
Subject: [PATCH 215/444] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0:?=
 =?UTF-8?q?=20(8.3.17+)=20=D0=A3=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B3=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedMethods8317.md     | 36 ++++++++++++++++++
 docs/en/diagnostics/DeprecatedMethods8317.md  | 36 ++++++++++++++++++
 .../DeprecatedMethods8317Diagnostic.java      | 37 +++++++++++++++++++
 ...recatedMethods8317Diagnostic_en.properties |  2 +
 ...recatedMethods8317Diagnostic_ru.properties |  2 +
 .../DeprecatedMethods8317DiagnosticTest.java  | 25 +++++++++++++
 .../DeprecatedMethods8317Diagnostic.bsl       |  1 +
 7 files changed, 139 insertions(+)
 create mode 100644 docs/diagnostics/DeprecatedMethods8317.md
 create mode 100644 docs/en/diagnostics/DeprecatedMethods8317.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl

diff --git a/docs/diagnostics/DeprecatedMethods8317.md b/docs/diagnostics/DeprecatedMethods8317.md
new file mode 100644
index 00000000000..6fcb1ecdbe5
--- /dev/null
+++ b/docs/diagnostics/DeprecatedMethods8317.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/DeprecatedMethods8317.md b/docs/en/diagnostics/DeprecatedMethods8317.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/DeprecatedMethods8317.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
new file mode 100644
index 00000000000..5be78a2aa68
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -0,0 +1,37 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
+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.DiagnosticScope;
+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 java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_17,
+  scope = DiagnosticScope.BSL,
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.DEPRECATED
+  }
+
+)
+public class DeprecatedMethods8317Diagnostic extends AbstractFindMethodDiagnostic {
+
+  private static final Pattern DEPRECATED_METHODS_NAMES = Pattern.compile(
+    "КраткоеПредставлениеОшибки|BriefErrorDescription" +
+      "ПодробноеПредставлениеОшибки|DetailErrorDescription" +
+      "ПоказатьИнформациюОбОшибке|ShowErrorInfo",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public DeprecatedMethods8317Diagnostic(DiagnosticInfo info) {
+    super(info, DEPRECATED_METHODS_NAMES);
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_en.properties
new file mode 100644
index 00000000000..cdbdb85e658
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=\"%s\" method is deprecated. You should use one of ErrorProcessingManager object type methods.
+diagnosticName=Using of deprecated platform 8.3.17 global methods
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_ru.properties
new file mode 100644
index 00000000000..fc1fd309efb
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Метод \"%s\" устарел. Следует использовать одноименный метод объекта типа МенеджерОбработкиОшибок
+diagnosticName=Использование устаревших глобальных методов платформы 8.3.17
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
new file mode 100644
index 00000000000..b54670902fc
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.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 DeprecatedMethods8317DiagnosticTest extends AbstractDiagnosticTest<DeprecatedMethods8317Diagnostic> {
+  DeprecatedMethods8317DiagnosticTest() {
+    super(DeprecatedMethods8317Diagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(6, 0, 6, 20);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl
@@ -0,0 +1 @@
+

From 0965538937651f0e0dd55635e000587f2eeac69e Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 15:21:36 +0300
Subject: [PATCH 216/444] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/IsInRoleMethodDiagnostic.md    | 15 +++++++++++++--
 docs/en/diagnostics/IsInRoleMethodDiagnostic.md | 11 ++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/docs/diagnostics/IsInRoleMethodDiagnostic.md b/docs/diagnostics/IsInRoleMethodDiagnostic.md
index 677453d4f2a..6c776a63cb8 100644
--- a/docs/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/diagnostics/IsInRoleMethodDiagnostic.md
@@ -10,8 +10,11 @@
 Для проверки прав доступа в коде следует использовать метод ПравоДоступа.
 
 В тех случаях, где роль не дает никаких прав на объекты метаданных, а служит только для определения того или иного дополнительного права, 
-следует использовать метод РольДоступна. При использовании в конфигурации Библиотеки стандартных подсистем (БСП) следует 
-использовать функцию РолиДоступны общего модуля Пользователи.
+следует использовать метод РольДоступна. 
+
+При использовании в конфигурации Библиотеки стандартных подсистем (БСП) следует 
+использовать функцию РолиДоступны общего модуля Пользователи. 
+Если в конфигурации не используется БСП, следует обязательно совмещать вызов РольДоступна() с проверкой на ПривилегированныйРежим().
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 ```
@@ -24,6 +27,14 @@
 Если ПравоДоступа("Редактирование", Метаданные.Справочники.СтраныМира) Тогда ...
 Если ПравоДоступа("Просмотр", Метаданные.Отчеты.ПопулярныеСтраны) Тогда ...
 ```
+```
+Неправильно:
+Если РольДоступна("Казначей") Тогда ...
+```
+```
+Правильно:
+Если РольДоступна("Казначей") ИЛИ ПривилегированныйРежим() Тогда ...
+```
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index d73b1abb148..b246634904d 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -11,7 +11,8 @@ To check access rights in the code, use the AccessRight method.
 
 When a role does not grant access rights to metadata objects and defines an additional access right only, 
 use the IsInRole method. If Standard Subsystems Library is used in a configuration,
-use the RolesAvailable function of the Users common module.
+use the RolesAvailable function of the Users common module, otherwise IsInRole method call must be combined with
+PrivilegedMode() method call.
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 ```
@@ -24,6 +25,14 @@ Correct example:
 If AccessRight("Edit", Metadata.Catalogs.WorldCountries) Then ...
 If AccessRight("View", Metadata.Reports.PopularCountries) Then ...
 ```
+```
+Incorrect:
+If IsInRole("Paymaster") Then ...
+```
+```
+Correct example:
+If IsInRole("Paymaster") OR PrivilegedMode() Then ...
+```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников

From cf379725c8d065cb5dbb9c2cfe0db8a416149439 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 15:43:55 +0300
Subject: [PATCH 217/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B.=20=D0=98?=
 =?UTF-8?q?=D0=B7=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D1=81=D1=8F=20=D0=BE=D1=82?=
 =?UTF-8?q?=20AbstractFind=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81,=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=BD=D0=B5=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=20=D0=BF=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B4=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B8=D0=BC=D1=8F?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedMethods8317Diagnostic.java      | 21 ++++++++++++++-----
 .../DeprecatedMethods8317DiagnosticTest.java  |  6 ++++--
 .../DeprecatedMethods8317Diagnostic.bsl       | 11 +++++++++-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
index 5be78a2aa68..372bb6b70b0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -7,6 +7,8 @@
 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 org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.regex.Pattern;
 
@@ -21,17 +23,26 @@
   }
 
 )
-public class DeprecatedMethods8317Diagnostic extends AbstractFindMethodDiagnostic {
+public class DeprecatedMethods8317Diagnostic extends AbstractVisitorDiagnostic {
 
   private static final Pattern DEPRECATED_METHODS_NAMES = Pattern.compile(
-    "КраткоеПредставлениеОшибки|BriefErrorDescription" +
-      "ПодробноеПредставлениеОшибки|DetailErrorDescription" +
-      "ПоказатьИнформациюОбОшибке|ShowErrorInfo",
+    "(КраткоеПредставлениеОшибки|BriefErrorDescription|" +
+      "ПодробноеПредставлениеОшибки|DetailErrorDescription|" +
+      "ПоказатьИнформациюОбОшибке|ShowErrorInfo)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
   );
 
   public DeprecatedMethods8317Diagnostic(DiagnosticInfo info) {
-    super(info, DEPRECATED_METHODS_NAMES);
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    if (DEPRECATED_METHODS_NAMES.matcher(ctx.methodName().getText()).matches()) {
+      diagnosticStorage.addDiagnostic(ctx.methodName(), info.getMessage(ctx.methodName().getText()));
+    }
+
+    return super.visitGlobalMethodCall(ctx);
   }
 
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
index b54670902fc..67e2321cce1 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
@@ -17,9 +17,11 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics).hasSize(3);
     assertThat(diagnostics, true)
-      .hasRange(6, 0, 6, 20);
+      .hasRange(4, 17, 4, 43)
+      .hasRange(5, 17, 5, 45)
+      .hasRange(6, 8, 6, 34);
 
   }
 }
diff --git a/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl
index 8b137891791..af8049f81fe 100644
--- a/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethods8317Diagnostic.bsl
@@ -1 +1,10 @@
-
+Процедура Тест()
+    Попытка
+        ВызватьИсключение "Тест";
+    Исключение
+        Сообщить(КраткоеПредставлениеОшибки(ИнформацияОбОшибке())); // Срабатывание
+        Сообщить(ПодробноеПредставлениеОшибки(ИнформацияОбОшибке())); // Срабатывание
+        ПоказатьИнформациюОбОшибке(ИнформацияОбОшибке()); // Срабатывание
+        Тест(); // Нет срабатывания
+    КонецПопытки;
+КонецПроцедуры

From b75d8d273445ad2fd5fa3ff3342c286386b8524e Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 16:09:14 +0300
Subject: [PATCH 218/444] precommit

---
 docs/diagnostics/DeprecatedMethods8317.md     | 31 +++++++++++--------
 docs/diagnostics/index.md                     |  5 +--
 docs/en/diagnostics/DeprecatedMethods8317.md  | 25 +++++++++------
 docs/en/diagnostics/index.md                  |  5 +--
 .../DeprecatedMethods8317Diagnostic.java      | 21 +++++++++++++
 .../configuration/parameters-schema.json      | 10 ++++++
 .../languageserver/configuration/schema.json  |  3 ++
 .../DeprecatedMethods8317DiagnosticTest.java  | 21 +++++++++++++
 8 files changed, 94 insertions(+), 27 deletions(-)

diff --git a/docs/diagnostics/DeprecatedMethods8317.md b/docs/diagnostics/DeprecatedMethods8317.md
index 6fcb1ecdbe5..b1524740c14 100644
--- a/docs/diagnostics/DeprecatedMethods8317.md
+++ b/docs/diagnostics/DeprecatedMethods8317.md
@@ -1,16 +1,20 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Использование устаревших глобальных методов платформы 8.3.17 (DeprecatedMethods8317)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Информационный` | `Да` | `5` | `deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-
-## Примеры
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
-
+В платформе 8.3.17 было реализовано свойство глобального контекста ОбработкаОшибок и 
+стандартная функция Управление настройками обработки ошибок, позволяющая настроить тексты ошибок. 
+Методы глобального контекста: 
+* КраткоеПредставлениеОшибки(); 
+* ПодробноеПредставлениеОшибки(); 
+* ПоказатьИнформациюОбОшибке() считаются устаревшими. 
+
+Необходимо использовать одноименные методы объекта ОбработкаОшибок.
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -18,19 +22,20 @@
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+* Источник: [Описание изменений платформы 8.3.17](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm#27f2dc70-f0cf-11e9-8371-0050569f678a)
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:DeprecatedMethods8317-off
+// BSLLS:DeprecatedMethods8317-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"DeprecatedMethods8317": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 208bf744d25..4951845a0a1 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **102**
+Общее количество: **103**
 
-* Дефект кода: **65**
+* Дефект кода: **66**
 * Уязвимость: **2**
 * Ошибка: **32**
 * Потенциальная уязвимость: **3**
@@ -44,6 +44,7 @@
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
+| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Использование устаревших глобальных методов платформы 8.3.17 | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
diff --git a/docs/en/diagnostics/DeprecatedMethods8317.md b/docs/en/diagnostics/DeprecatedMethods8317.md
index 4e7e0f78ada..ddc9556ada3 100644
--- a/docs/en/diagnostics/DeprecatedMethods8317.md
+++ b/docs/en/diagnostics/DeprecatedMethods8317.md
@@ -1,16 +1,20 @@
-# <Diagnostic name>
+# Using of deprecated platform 8.3.17 global methods (DeprecatedMethods8317)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+In platform 8.3.17, the global context property ErrorProcessing was implemented.
 
-## Examples
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+The following global context methods are deprecated and should not be used:
+* BriefErrorDescription()
+* DetailErrorDescription()
+* ShowErrorInfo()
 
+You should use the same methods of the ErrorProcessing object instead.
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 <!-- Примеры источников
@@ -18,19 +22,20 @@
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
 * Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+* Source: [Platform 8.3.17 changelog](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm)
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:DeprecatedMethods8317-off
+// BSLLS:DeprecatedMethods8317-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"DeprecatedMethods8317": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 5ece9f38a77..831a87b67b1 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **102**
+Total: **103**
 
 * Error: **32**
-* Code smell: **65**
+* Code smell: **66**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
@@ -44,6 +44,7 @@ Total: **102**
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
index 372bb6b70b0..f1657a62c2f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
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 3b2b537e167..149f5e77bca 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
@@ -326,6 +326,16 @@
             "title": "Deprecated client application method.",
             "$id": "#/definitions/DeprecatedMethods8310"
         },
+        "DeprecatedMethods8317": {
+            "description": "Using of deprecated platform 8.3.17 global methods",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Using of deprecated platform 8.3.17 global methods",
+            "$id": "#/definitions/DeprecatedMethods8317"
+        },
         "DeprecatedTypeManagedForm": {
             "description": "Deprecated ManagedForm type",
             "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 dd5960db17f..f2b6b56669b 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
@@ -104,6 +104,9 @@
                 "DeprecatedMethods8310": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedMethods8310"
                 },
+                "DeprecatedMethods8317": {
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedMethods8317"
+                },
                 "DeprecatedTypeManagedForm": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedTypeManagedForm"
                 },
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
index 67e2321cce1..05dacc261d5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317DiagnosticTest.java
@@ -1,3 +1,24 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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 11a2f46dc91987519f837f5429e0579ca46a36a9 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 12:00:47 +0300
Subject: [PATCH 219/444] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B0:?=
 =?UTF-8?q?=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=BD=D0=B5=D1=8F?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=80=D0=B5=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=91?=
 =?UTF-8?q?=D0=B5=D0=B7=D0=BE=D0=BF=D0=B0=D1=81=D0=BD=D1=8B=D0=B9=D0=A0?=
 =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=20=D0=BA=20=D1=82=D0=B8=D0=BF=D1=83=20?=
 =?UTF-8?q?=D0=91=D1=83=D0=BB=D0=B5=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/UnsafeSafeModeMethodCall.md  | 56 +++++++++++++
 docs/diagnostics/index.md                     |  3 +-
 .../diagnostics/UnsafeSafeModeMethodCall.md   | 52 ++++++++++++
 docs/en/diagnostics/index.md                  |  3 +-
 .../UnsafeSafeModeMethodCallDiagnostic.java   | 81 +++++++++++++++++++
 .../configuration/parameters-schema.json      | 10 +++
 .../languageserver/configuration/schema.json  |  3 +
 ...SafeModeMethodCallDiagnostic_en.properties |  2 +
 ...SafeModeMethodCallDiagnostic_ru.properties |  2 +
 ...nsafeSafeModeMethodCallDiagnosticTest.java | 47 +++++++++++
 .../UnsafeSafeModeMethodCallDiagnostic.bsl    | 15 ++++
 11 files changed, 272 insertions(+), 2 deletions(-)
 create mode 100644 docs/diagnostics/UnsafeSafeModeMethodCall.md
 create mode 100644 docs/en/diagnostics/UnsafeSafeModeMethodCall.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl

diff --git a/docs/diagnostics/UnsafeSafeModeMethodCall.md b/docs/diagnostics/UnsafeSafeModeMethodCall.md
new file mode 100644
index 00000000000..6feb15e83ba
--- /dev/null
+++ b/docs/diagnostics/UnsafeSafeModeMethodCall.md
@@ -0,0 +1,56 @@
+# Небезопасное использование функции БезопасныйРежим() (UnsafeSafeModeMethodCall)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL` | `Блокирующий` | `Да` | `1` | `standard`<br/>`deprecated`<br/>`error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+Разработчики допускают ошибки, используя неявное преобразование БезопасныйРежим к типу Булево
+
+На самом деле этот метод может вернуть имя профиля строкой при включенном профиле безопасности в кластере, а может Истина или Ложь.
+
+Cледует использовать БезопасныйРежим() <> Ложь или БезопасныйРежим() = Ложь
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+Неправильно:
+```
+Если БезопасныйРежим() Тогда
+     // Логика выполнения в безопасном режиме...
+КонецЕсли;
+
+Если Не БезопасныйРежим() Тогда
+     // Логика выполнения в небезопасном режиме...
+КонецЕсли;
+```
+Правильно:
+```
+Если БезопасныйРежим() <> Ложь Тогда
+    // Логика выполнения в безопасном режиме...
+КонецЕсли
+```
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+* Источник: [Тип значения, возвращаемый методом "БезопасныйРежим()](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:UnsafeSafeModeMethodCall-off
+// BSLLS:UnsafeSafeModeMethodCall-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"UnsafeSafeModeMethodCall": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 4ac56f2beda..d825cb6c807 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -12,7 +12,7 @@
 
 * Дефект кода: **66**
 * Уязвимость: **2**
-* Ошибка: **32**
+* Ошибка: **33**
 * Потенциальная уязвимость: **3**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -103,6 +103,7 @@
 | [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Унарный плюс в конкатенации строк | Да | Блокирующий | Ошибка | `suspicious`<br/>`brainoverload` |
 | [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Неизвестный символ препроцессора | Да | Критичный | Ошибка | `standard`<br/>`error` |
 | [UnreachableCode](UnreachableCode.md) | Недостижимый код | Да | Незначительный | Ошибка | `design`<br/>`suspicious` |
+| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Небезопасное использование функции БезопасныйРежим() | Да | Блокирующий | Ошибка | `standard`<br/>`deprecated`<br/>`error` |
 | [UnusedLocalMethod](UnusedLocalMethod.md) | Неиспользуемый локальный метод | Да | Важный | Дефект кода | `standard`<br/>`suspicious` |
 | [UnusedParameters](UnusedParameters.md) | Неиспользуемый параметр | Да | Важный | Дефект кода | `design` |
 | [UseLessForEach](UseLessForEach.md) | Бесполезный перебор коллекции | Да | Критичный | Ошибка | `clumsy` |
diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
new file mode 100644
index 00000000000..4f145f8f84d
--- /dev/null
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -0,0 +1,52 @@
+# Unsafe SafeMode method call (UnsafeSafeModeMethodCall)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `standard`<br/>`deprecated`<br/>`error` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+Developers make mistakes using the implicit conversion SafeMode() to Boolean type
+
+In fact, this method can return the profile name with a string.
+
+Use SafeMode() <> False or SafeMode() = False
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+Incorrect:
+```
+If SafeMode() Then
+// some code
+EndIf;
+```
+Correct:
+```
+If SafeMode() = True Then
+// some code
+EndIf;
+```
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+Source: [SafeMode method](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:UnsafeSafeModeMethodCall-off
+// BSLLS:UnsafeSafeModeMethodCall-on
+```
+
+### Parameter for config
+
+```json
+"UnsafeSafeModeMethodCall": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index ed79ba2b9a8..6a5d76186b0 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -10,7 +10,7 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 Total: **103**
 
-* Error: **32**
+* Error: **33**
 * Code smell: **66**
 * Vulnerability: **2**
 * Security Hotspot: **3**
@@ -103,6 +103,7 @@ Total: **103**
 | [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br/>`brainoverload` |
 | [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br/>`error` |
 | [UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br/>`suspicious` |
+| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `standard`<br/>`deprecated`<br/>`error` |
 | [UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br/>`suspicious` |
 | [UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design` |
 | [UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
new file mode 100644
index 00000000000..6016c758fd5
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -0,0 +1,81 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.DiagnosticScope;
+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.utils.Trees;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.BLOCKER,
+  scope = DiagnosticScope.BSL,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.DEPRECATED,
+    DiagnosticTag.ERROR
+  }
+
+)
+public class UnsafeSafeModeMethodCallDiagnostic extends AbstractFindMethodDiagnostic {
+
+  private static final Pattern SAFE_MODE_METHOD_NAME = Pattern.compile(
+    "(БезопасныйРежим|SafeMode)",
+    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  );
+
+  public UnsafeSafeModeMethodCallDiagnostic(DiagnosticInfo info) {
+    super(info, SAFE_MODE_METHOD_NAME);
+  }
+
+  @Override
+  protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
+    return false;
+  }
+
+  @Override
+  protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+
+    var rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
+    var rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
+    var currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
+      return false;
+    }
+
+    int indexOfCurrentMemberNode = rootExpressionNode.children.indexOf(currentRootMember);
+    if (indexOfCurrentMemberNode != rootExpressionNode.getChildCount() - 1) {
+      var nextNode = rootExpressionNode.children.get(indexOfCurrentMemberNode + 1);
+      return !(Trees.nodeContains(nextNode, BSLParser.RULE_compareOperation));
+    } else {
+      return true;
+    }
+  }
+}
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 39f207391b7..b4b5c1947fd 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
@@ -1118,6 +1118,16 @@
             "title": "Unreachable Code",
             "$id": "#/definitions/UnreachableCode"
         },
+        "UnsafeSafeModeMethodCall": {
+            "description": "Unsafe SafeMode method call",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Unsafe SafeMode method call",
+            "$id": "#/definitions/UnsafeSafeModeMethodCall"
+        },
         "UnusedLocalMethod": {
             "description": "Unused local 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 b2730596359..dfb3b914f9b 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
@@ -281,6 +281,9 @@
                 "UnreachableCode": {
                     "$ref": "parameters-schema.json#/definitions/UnreachableCode"
                 },
+                "UnsafeSafeModeMethodCall": {
+                    "$ref": "parameters-schema.json#/definitions/UnsafeSafeModeMethodCall"
+                },
                 "UnusedLocalMethod": {
                     "$ref": "parameters-schema.json#/definitions/UnusedLocalMethod"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_en.properties
new file mode 100644
index 00000000000..5df6b34c293
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Use explicit comparison with boolean when calling SafeMode method
+diagnosticName=Unsafe SafeMode method call
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_ru.properties
new file mode 100644
index 00000000000..9f32d413e9f
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Используйте явное сравнение с Булево при вызове БезопасныйРежим()
+diagnosticName=Небезопасное использование функции БезопасныйРежим()
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
new file mode 100644
index 00000000000..e62504d631f
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
@@ -0,0 +1,47 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class UnsafeSafeModeMethodCallDiagnosticTest extends AbstractDiagnosticTest<UnsafeSafeModeMethodCallDiagnostic> {
+  UnsafeSafeModeMethodCallDiagnosticTest() {
+    super(UnsafeSafeModeMethodCallDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(3);
+    assertThat(diagnostics, true)
+      .hasRange(1, 9, 1, 24)
+      .hasRange(3, 17, 3, 32)
+      .hasRange(7, 12, 7, 27);
+  }
+}
diff --git a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
new file mode 100644
index 00000000000..d9e0685c423
--- /dev/null
+++ b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
@@ -0,0 +1,15 @@
+Процедура Тест()
+    Если БезопасныйРежим() ИЛИ Тест = Истина Тогда  // Срабатывание
+         // Логика выполнения в безопасном режиме...
+    ИначеЕсли Не БезопасныйРежим() Тогда // Срабатывание
+        // Логика выполнения в небезопасном режиме...
+    КонецЕсли;
+
+    Если Не БезопасныйРежим() Тогда // Срабатывание
+         // Логика выполнения в небезопасном режиме...
+    КонецЕсли;
+
+    Если БезопасныйРежим() <> Ложь Тогда // Нет срабатывания
+        // Логика выполнения в безопасном режиме...
+    КонецЕсли;
+КонецПроцедуры
\ No newline at end of file

From ba9759c5b2643d45223332a1b8cbe287ba194fce Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 13:10:44 +0300
Subject: [PATCH 220/444] =?UTF-8?q?=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=208.3.1=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B5=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

---
 docs/diagnostics/UnsafeSafeModeMethodCall.md           | 10 ++++++----
 docs/en/diagnostics/UnsafeSafeModeMethodCall.md        | 10 +++++++---
 .../UnsafeSafeModeMethodCallDiagnostic.java            |  2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/docs/diagnostics/UnsafeSafeModeMethodCall.md b/docs/diagnostics/UnsafeSafeModeMethodCall.md
index 6feb15e83ba..c2199ad180c 100644
--- a/docs/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/diagnostics/UnsafeSafeModeMethodCall.md
@@ -7,11 +7,13 @@
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-Разработчики допускают ошибки, используя неявное преобразование БезопасныйРежим к типу Булево
+В "1С:Предприятии 8.3" метод глобального контекста БезопасныйРежим() возвращает тип Строка, 
+если безопасный режим был установлен с указанием имени профиля безопасности.
 
-На самом деле этот метод может вернуть имя профиля строкой при включенном профиле безопасности в кластере, а может Истина или Ложь.
-
-Cледует использовать БезопасныйРежим() <> Ложь или БезопасныйРежим() = Ложь
+Использования метода БезопасныйРежим(),
+ в которых результат неявно преобразовывается к типу Булево является небезопасным, 
+ необходимо исправить на код с явным сравнением результата со значением Ложь. 
+ Таким образом, при установленном профиле безопасности код будет выполняться так же, как и в безопасном режиме.
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 Неправильно:
diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
index 4f145f8f84d..f0387863219 100644
--- a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -7,11 +7,15 @@
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-Developers make mistakes using the implicit conversion SafeMode() to Boolean type
+In "1C: Enterprise 8.3" the global context method SafeMode () returns the type String,
+if safe mode was set with the name of the security profile.
 
-In fact, this method can return the profile name with a string.
+Using the Safe Mode () method,
+ in which the result is implicitly converted to a Boolean type is unsafe,
+ must be corrected for the code with an explicit comparison of the result with the value False.
+ Thus, with the installed security profile, the code will be executed in the same way as in the safe mode.
 
-Use SafeMode() <> False or SafeMode() = False
+Use SafeMode() <> False
 ## Examples
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 Incorrect:
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 6016c758fd5..eb106484d9c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
 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.DiagnosticScope;
@@ -36,6 +37,7 @@
   type = DiagnosticType.ERROR,
   severity = DiagnosticSeverity.BLOCKER,
   scope = DiagnosticScope.BSL,
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_1,
   minutesToFix = 1,
   tags = {
     DiagnosticTag.STANDARD,

From 139b0acfc11d5e499b5afb8b04a6685722a42690 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 14:39:24 +0300
Subject: [PATCH 221/444] =?UTF-8?q?1.=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=B3=20Standard=202.=20=D0=94=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BA=D0=B0=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F?=
 =?UTF-8?q?=D1=80=D0=BA=D0=BE=D0=B9=203.=20=D0=A0=D0=B0=D1=81=D1=88=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/UnsafeSafeModeMethodCall.md                  | 2 +-
 docs/diagnostics/index.md                                     | 2 +-
 docs/en/diagnostics/UnsafeSafeModeMethodCall.md               | 2 +-
 docs/en/diagnostics/index.md                                  | 2 +-
 .../diagnostics/UnsafeSafeModeMethodCallDiagnostic.java       | 4 ++--
 .../diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl        | 4 ++++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/diagnostics/UnsafeSafeModeMethodCall.md b/docs/diagnostics/UnsafeSafeModeMethodCall.md
index c2199ad180c..35cd5e5fb68 100644
--- a/docs/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/diagnostics/UnsafeSafeModeMethodCall.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Ошибка` | `BSL` | `Блокирующий` | `Да` | `1` | `standard`<br/>`deprecated`<br/>`error` |
+| `Ошибка` | `BSL` | `Блокирующий` | `Да` | `1` | `deprecated`<br/>`error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index d825cb6c807..128ce5cfcfa 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -103,7 +103,7 @@
 | [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Унарный плюс в конкатенации строк | Да | Блокирующий | Ошибка | `suspicious`<br/>`brainoverload` |
 | [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Неизвестный символ препроцессора | Да | Критичный | Ошибка | `standard`<br/>`error` |
 | [UnreachableCode](UnreachableCode.md) | Недостижимый код | Да | Незначительный | Ошибка | `design`<br/>`suspicious` |
-| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Небезопасное использование функции БезопасныйРежим() | Да | Блокирующий | Ошибка | `standard`<br/>`deprecated`<br/>`error` |
+| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Небезопасное использование функции БезопасныйРежим() | Да | Блокирующий | Ошибка | `deprecated`<br/>`error` |
 | [UnusedLocalMethod](UnusedLocalMethod.md) | Неиспользуемый локальный метод | Да | Важный | Дефект кода | `standard`<br/>`suspicious` |
 | [UnusedParameters](UnusedParameters.md) | Неиспользуемый параметр | Да | Важный | Дефект кода | `design` |
 | [UseLessForEach](UseLessForEach.md) | Бесполезный перебор коллекции | Да | Критичный | Ошибка | `clumsy` |
diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
index f0387863219..2251e862871 100644
--- a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `standard`<br/>`deprecated`<br/>`error` |
+| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `deprecated`<br/>`error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 6a5d76186b0..5a81c30c731 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -103,7 +103,7 @@ Total: **103**
 | [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br/>`brainoverload` |
 | [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br/>`error` |
 | [UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br/>`suspicious` |
-| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `standard`<br/>`deprecated`<br/>`error` |
+| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `deprecated`<br/>`error` |
 | [UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br/>`suspicious` |
 | [UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design` |
 | [UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index eb106484d9c..1b0b2b9717a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -40,7 +40,6 @@
   compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_1,
   minutesToFix = 1,
   tags = {
-    DiagnosticTag.STANDARD,
     DiagnosticTag.DEPRECATED,
     DiagnosticTag.ERROR
   }
@@ -68,7 +67,8 @@ protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     var rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
     var rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
     var currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
-    if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
+    if (!SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()
+    || rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
       return false;
     }
 
diff --git a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
index d9e0685c423..d33de2443ab 100644
--- a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
@@ -12,4 +12,8 @@
     Если БезопасныйРежим() <> Ложь Тогда // Нет срабатывания
         // Логика выполнения в безопасном режиме...
     КонецЕсли;
+
+    Если Тест() ИЛИ Тест = Истина Тогда  // Нет срабатывания
+        // код
+    КонецЕсли;
 КонецПроцедуры
\ No newline at end of file

From 01986dc6875e8e5ffa4d8ea75c926edd2084e65c Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 14:43:57 +0300
Subject: [PATCH 222/444] =?UTF-8?q?return=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=86=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UnsafeSafeModeMethodCallDiagnostic.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 1b0b2b9717a..e516b3f3813 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -76,8 +76,8 @@ protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     if (indexOfCurrentMemberNode != rootExpressionNode.getChildCount() - 1) {
       var nextNode = rootExpressionNode.children.get(indexOfCurrentMemberNode + 1);
       return !(Trees.nodeContains(nextNode, BSLParser.RULE_compareOperation));
-    } else {
-      return true;
     }
+
+    return true;
   }
 }

From ad56201be55f180c777bf906bf0693fd3425a672 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 29 Apr 2020 15:50:05 +0300
Subject: [PATCH 223/444] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=83=D1=80=D1=81=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsafeSafeModeMethodCallDiagnostic.java     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index e516b3f3813..1cac49560e0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 
 import java.util.regex.Pattern;
 
@@ -64,11 +65,17 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
   @Override
   protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
-    var rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
-    var rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
-    var currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
-    if (!SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()
-    || rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
+    BSLParserRuleContext rootIfNode = null;
+    BSLParserRuleContext rootExpressionNode = null;
+    BSLParserRuleContext currentRootMember = null;
+
+    if (SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
+      rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
+      rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
+      currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    }
+
+    if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
       return false;
     }
 

From 091366a51fa0c1cd6730823f95f15fe01f23b40e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 29 Apr 2020 17:56:02 +0300
Subject: [PATCH 224/444] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B8=20=D1=80=D0=B5?=
 =?UTF-8?q?=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsafeSafeModeMethodCallDiagnostic.java        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 1cac49560e0..77145d8d86e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -65,16 +65,14 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
   @Override
   protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
-    BSLParserRuleContext rootIfNode = null;
-    BSLParserRuleContext rootExpressionNode = null;
-    BSLParserRuleContext currentRootMember = null;
-
-    if (SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
-      rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
-      rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
-      currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    if (!SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
+      return false;
     }
 
+    BSLParserRuleContext rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
+    BSLParserRuleContext rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
+    BSLParserRuleContext currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+
     if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
       return false;
     }

From 6338854611832282dd04485cb60c2dc7de73982d Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 29 Apr 2020 17:57:26 +0300
Subject: [PATCH 225/444] precommit

---
 docs/diagnostics/index.md    | 2 +-
 docs/en/diagnostics/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 128ce5cfcfa..c5bd626e33a 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,7 +8,7 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **103**
+Общее количество: **104**
 
 * Дефект кода: **66**
 * Уязвимость: **2**
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 5a81c30c731..47b90c13659 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,7 +8,7 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **103**
+Total: **104**
 
 * Error: **33**
 * Code smell: **66**

From e47afab3f7c1b34737be0922d23f8acf5cebee2c Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Wed, 29 Apr 2020 21:32:38 +0300
Subject: [PATCH 226/444] Some cleanups.

---
 .../context/DocumentContext.java              | 23 +++++++------------
 .../diagnostics/EmptyRegionDiagnostic.java    |  8 +++----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index 2836d421a62..c6806778b40 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -54,6 +54,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import static java.util.Objects.requireNonNull;
@@ -273,17 +274,11 @@ private MetricStorage computeMetrics() {
     metricsTemp.setFunctions(Math.toIntExact(methodsUnboxed.stream().filter(MethodSymbol::isFunction).count()));
     metricsTemp.setProcedures(methodsUnboxed.size() - metricsTemp.getFunctions());
 
-    int ncloc = (int) getTokensFromDefaultChannel().stream()
-      .map(Token::getLine)
-      .distinct()
-      .count();
-
-    metricsTemp.setNcloc(ncloc);
-
     int[] nclocData = getTokensFromDefaultChannel().stream()
       .mapToInt(Token::getLine)
       .distinct().toArray();
     metricsTemp.setNclocData(nclocData);
+    metricsTemp.setNcloc(nclocData.length);
 
     metricsTemp.setCovlocData(computeCovlocData());
 
@@ -296,13 +291,11 @@ private MetricStorage computeMetrics() {
     }
     metricsTemp.setLines(lines);
 
-    int comments;
-    final List<Token> commentsUnboxed = getComments();
-    if (commentsUnboxed.isEmpty()) {
-      comments = 0;
-    } else {
-      comments = (int) commentsUnboxed.stream().map(Token::getLine).distinct().count();
-    }
+    int comments = (int) getComments()
+      .stream()
+      .map(Token::getLine)
+      .distinct()
+      .count();
     metricsTemp.setComments(comments);
 
     int statements = Trees.findAllRuleNodes(getAst(), BSLParser.RULE_statement).size();
@@ -317,7 +310,7 @@ private MetricStorage computeMetrics() {
   private int[] computeCovlocData() {
 
     return Trees.getDescendants(getAst()).stream()
-      .filter(node -> !(node instanceof TerminalNodeImpl))
+      .filter(Predicate.not(TerminalNodeImpl.class::isInstance))
       .filter(DocumentContext::mustCovered)
       .mapToInt(node -> ((BSLParserRuleContext) node).getStart().getLine())
       .distinct().toArray();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index dc8cbca0c70..a8d3c5e5624 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -97,11 +97,6 @@ public List<CodeAction> getQuickFixes(
     for (Diagnostic diagnostic : diagnostics) {
 
       int diagnosticStartLine = diagnostic.getRange().getStart().getLine();
-      Position diagnosticRangeStart = diagnostic.getRange().getStart();
-      diagnosticRangeStart = new Position(
-        diagnosticRangeStart.getLine(),
-        diagnosticRangeStart.getCharacter() - 1
-      );
 
       Optional<RegionSymbol> optionalRegionSymbol = documentContext.getSymbolTree().getRegionsFlat()
         .stream()
@@ -121,6 +116,9 @@ public List<CodeAction> getQuickFixes(
         maxDiagnosticEndLine = diagnosticEndLine;
       }
 
+      int diagnosticStartCharacter = diagnostic.getRange().getStart().getCharacter() - 1;
+      Position diagnosticRangeStart = new Position(diagnosticStartLine, diagnosticStartCharacter);
+
       Position diagnosticRangeEnd = new Position(
         diagnosticEndLine + 1,
         0

From f2004a9df109e885bed984c8d156c8743f3132f5 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Thu, 30 Apr 2020 12:01:34 +0300
Subject: [PATCH 227/444] =?UTF-8?q?1.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7=20develop=202.=20?=
 =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=20AbstractF?=
 =?UTF-8?q?indMethod=203.=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20AbstractFindMethod=20-=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D1=80=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B4=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=204.=20precommit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/index.md                     |  5 +++--
 docs/en/diagnostics/index.md                  |  5 +++--
 .../AbstractFindMethodDiagnostic.java         |  9 +++++++--
 .../DeprecatedMethods8317Diagnostic.java      | 20 +++++++++++--------
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index c5bd626e33a..bced0c76ef5 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **104**
+Общее количество: **105**
 
-* Дефект кода: **66**
+* Дефект кода: **67**
 * Уязвимость: **2**
 * Ошибка: **33**
 * Потенциальная уязвимость: **3**
@@ -44,6 +44,7 @@
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
+| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Использование устаревших глобальных методов платформы 8.3.17 | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Повторяющиеся разделы модуля | Да | Информационный | Дефект кода | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Пустой блок кода | Да | Важный | Дефект кода | `badpractice`<br/>`suspicious` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 47b90c13659..c712c1ff135 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **104**
+Total: **105**
 
 * Error: **33**
-* Code smell: **66**
+* Code smell: **67**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
@@ -44,6 +44,7 @@ Total: **104**
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
 | [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
 | [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
index 99f803a1874..9ddd8530fb9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
@@ -23,6 +23,7 @@
 
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import lombok.Getter;
 import lombok.Setter;
 import org.antlr.v4.runtime.tree.ParseTree;
@@ -48,11 +49,15 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
     return getMethodPattern().matcher(ctx.methodName().getText()).matches();
   }
 
+  protected String getMessage(BSLParserRuleContext ctx) {
+    return info.getMessage(ctx.getText());
+  }
+
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
     if (checkGlobalMethodCall(ctx)) {
-      diagnosticStorage.addDiagnostic(ctx.methodName());
+      diagnosticStorage.addDiagnostic(ctx.methodName(), getMessage(ctx));
     }
 
     return super.visitGlobalMethodCall(ctx);
@@ -62,7 +67,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
   public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
 
     if (checkMethodCall(ctx)) {
-      diagnosticStorage.addDiagnostic(ctx.methodName());
+      diagnosticStorage.addDiagnostic(ctx.methodName(), getMessage(ctx));
     }
 
     return super.visitMethodCall(ctx);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
index f1657a62c2f..098a93f28c7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -29,7 +29,7 @@
 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 org.antlr.v4.runtime.tree.ParseTree;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 
 import java.util.regex.Pattern;
 
@@ -44,7 +44,7 @@
   }
 
 )
-public class DeprecatedMethods8317Diagnostic extends AbstractVisitorDiagnostic {
+public class DeprecatedMethods8317Diagnostic extends AbstractFindMethodDiagnostic {
 
   private static final Pattern DEPRECATED_METHODS_NAMES = Pattern.compile(
     "(КраткоеПредставлениеОшибки|BriefErrorDescription|" +
@@ -54,16 +54,20 @@ public class DeprecatedMethods8317Diagnostic extends AbstractVisitorDiagnostic {
   );
 
   public DeprecatedMethods8317Diagnostic(DiagnosticInfo info) {
-    super(info);
+    super(info, DEPRECATED_METHODS_NAMES);
   }
 
   @Override
-  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
-    if (DEPRECATED_METHODS_NAMES.matcher(ctx.methodName().getText()).matches()) {
-      diagnosticStorage.addDiagnostic(ctx.methodName(), info.getMessage(ctx.methodName().getText()));
+  protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
+    return false;
+  }
+
+  @Override
+  protected String getMessage(BSLParserRuleContext ctx) {
+    if (ctx instanceof BSLParser.GlobalMethodCallContext) {
+      return info.getMessage(((BSLParser.GlobalMethodCallContext) ctx).methodName().getText());
     }
 
-    return super.visitGlobalMethodCall(ctx);
+    return "";
   }
-
 }

From 6e47b3f2f0c43a1395520b0c3b61b75f088cc421 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 00:21:35 +0300
Subject: [PATCH 228/444] javadoc

---
 .github/workflows/gh-pages.yml                       | 12 ++++++++++++
 docs/contributing/index.md                           |  1 +
 .../configuration/diagnostics/Mode.java              |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 84fb4cebea5..7676da61c6f 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -17,6 +17,14 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
+    - name: Setup JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+
+    - name: Build javadoc
+      run: ./gradlew javadoc
+
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
@@ -82,6 +90,10 @@ jobs:
       run: |
         cp -R tmp-bench/. temp/site/bench
         rm -rf tmp-bench
+
+    - name: Copy javadoc
+      run: |
+        cp -R build/docs/javadoc temp/site/javadoc
  
     - name: Public Russian Master
       if: github.ref == 'refs/heads/master'
diff --git a/docs/contributing/index.md b/docs/contributing/index.md
index 8abaa5b9f32..61cc0dd890a 100644
--- a/docs/contributing/index.md
+++ b/docs/contributing/index.md
@@ -8,6 +8,7 @@
     - [Настройка окружения](EnvironmentSetting.md)
     - [Быстрый старт](FastStart.md)
     - [Руководство по стилю](StyleGuide.md)
+    - [JavaDoc](../javadoc/index.html)
 - Разработка диагностик
     - [Процесс (workflow) разработки диагностики](DiagnosticDevWorkFlow.md)
     - [Пример разработки диагностики](DiagnosticExample.md)
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
index 7e2ab869aea..0dd8e5bfefb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/Mode.java
@@ -25,7 +25,7 @@
 
 /**
  * Режим для учета настроек правил.
- * <p/>
+ * <p>
  * См. {@link DiagnosticsOptions#getParameters()}
  */
 public enum Mode {

From 0b031d46219e4e2802ee592c89ed1ce8b23fcd59 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 00:40:07 +0300
Subject: [PATCH 229/444] javadoc 14

---
 .github/workflows/gh-pages.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 7676da61c6f..2cc67f3d97b 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Setup JDK 11
+    - name: Setup JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 14
 
     - name: Build javadoc
       run: ./gradlew javadoc

From d167b92abefeb92e464cff72d5ba245392c5d59a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 00:43:03 +0300
Subject: [PATCH 230/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D1=81=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/gh-pages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 2cc67f3d97b..952b3f686ea 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -10,6 +10,7 @@ on:
     - 'src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/**'
     - 'mkdocs.yml'
     - 'mkdocs.en.yml'
+    - '.github/workflows/gh-pages.yml'
 
 jobs:
   build-deploy:

From ecf358e7bcd3b60683ec1bd2edb3c7196f07940b Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 00:45:26 +0300
Subject: [PATCH 231/444] =?UTF-8?q?=D0=98=D0=B3=D0=BD=D0=BE=D1=80=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                |  3 ++-
 .idea/checkstyle-idea.xml | 16 ----------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 .idea/checkstyle-idea.xml

diff --git a/.gitignore b/.gitignore
index 1d542df92b1..2124d55423f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,9 +61,10 @@ gen/
 
 .idea/sonarlint-state.xml
 .idea/sonarlint.xml
+.idea/checkstyle-idea.xml
 *.bak
 *.orig
 
 # mkdocs
 temp/
-public/
\ No newline at end of file
+public/
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index 32af77d10a7..00000000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="checkstyle-version" value="8.13" />
-        <entry key="copy-libs" value="true" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnly" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 9e0fc7e36a0e1d00393e1bb415dca243725d8fa6 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 00:45:26 +0300
Subject: [PATCH 232/444] =?UTF-8?q?=D0=9F=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=20=D0=B2=20javadoc-=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/javadoc/.empty | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/javadoc/.empty

diff --git a/docs/javadoc/.empty b/docs/javadoc/.empty
new file mode 100644
index 00000000000..e69de29bb2d

From cc9a538ea0017ccaf3c2d7e9b2f6e2af1337bf8e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 01:11:42 +0300
Subject: [PATCH 233/444] .nojekyll

https://github.blog/2009-12-29-bypassing-jekyll-on-github-pages/
---
 docs/.nojekyll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.nojekyll

diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/docs/.nojekyll
@@ -0,0 +1 @@
+

From 030f3ad6e1e550c3cfdbb9b653c3109aed6902ee Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 01:14:52 +0300
Subject: [PATCH 234/444] =?UTF-8?q?=D0=A3=D1=81=D0=BA=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 952b3f686ea..0d61532924d 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -24,7 +24,7 @@ jobs:
         java-version: 14
 
     - name: Build javadoc
-      run: ./gradlew javadoc
+      run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
       uses: actions/setup-python@v1

From bdcad7ae9f368f583016f9c4836d817c730169b7 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 01:35:01 +0300
Subject: [PATCH 235/444] Create .nojekyll

---
 .nojekyll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .nojekyll

diff --git a/.nojekyll b/.nojekyll
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/.nojekyll
@@ -0,0 +1 @@
+

From 0d82c612b40bc66474d59bba0eaa1cd009abe926 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 01:35:19 +0300
Subject: [PATCH 236/444] Delete .nojekyll

---
 docs/.nojekyll | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/.nojekyll

diff --git a/docs/.nojekyll b/docs/.nojekyll
deleted file mode 100644
index 8b137891791..00000000000
--- a/docs/.nojekyll
+++ /dev/null
@@ -1 +0,0 @@
-

From 47c12efdd3f24a948b32e958c469f31aca880b88 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 2 May 2020 13:49:24 +0300
Subject: [PATCH 237/444] =?UTF-8?q?=D0=9F=D0=9A=D0=9C=20=D0=BF=D0=BE=20fil?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/FastStart.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/FastStart.md b/docs/contributing/FastStart.md
index 04e325cd8b4..53998805847 100644
--- a/docs/contributing/FastStart.md
+++ b/docs/contributing/FastStart.md
@@ -28,5 +28,5 @@
   - Установить настройку `Case transformation in the Preview window` в `Transform to uppercase when lexing`
 6. Открыть файл `build.gradle.kts` из каталога проекта, согласиться с импортом зависимостей, дождаться их скачивания
 7. Открыть файл `src/main/antlr/BSLParser.g4`
-8. Установить курсор на любую строку с кодом _(не комментарий)_ и выбрать пункт контекстного меню `Test Rule file`
+8. Установить курсор строку с правилом `file:` (первое правило в файле) и выбрать пункт контекстного меню `Test Rule file`
 9. В открывшемся окне выбрать bsl-файл либо вставить текст из буфера обмена

From c8c60feacba528cc556878322f1286e956889840 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Sat, 2 May 2020 18:20:25 +0700
Subject: [PATCH 238/444] Create _config.yml

---
 docs/_config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/_config.yml

diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000000..3f74121b111
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1 @@
+include: ['/javadoc/com/github/_1c_syntax']

From a99c345d0eaaa17c4bdfd112fe00ffd80a5189ef Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Sat, 2 May 2020 18:39:05 +0700
Subject: [PATCH 239/444] Create .nojekyll

---
 docs/.nojekyll | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.nojekyll

diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/docs/.nojekyll
@@ -0,0 +1 @@
+

From c780769b72f1e8f39828409547bc3732a21ef6a7 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Sat, 2 May 2020 19:53:21 +0700
Subject: [PATCH 240/444] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=B5?=
 =?UTF-8?q?=D0=BC=20nojekyll=20=D0=BF=D1=80=D0=B8=20deploy=20gh-pages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/gh-pages.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 0d61532924d..cff66cc8e24 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -95,6 +95,7 @@ jobs:
     - name: Copy javadoc
       run: |
         cp -R build/docs/javadoc temp/site/javadoc
+        echo "" > temp/site/.nojekyll
  
     - name: Public Russian Master
       if: github.ref == 'refs/heads/master'

From f7f965bdf393a21e63a31a7fd496dbf788f7e153 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Sun, 3 May 2020 14:42:43 +0300
Subject: [PATCH 241/444] =?UTF-8?q?1.=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=20AbstractFindMethodDiagnostic=202.=20?=
 =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20javadoc=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20AbstractFindMethodDiagnostic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractFindMethodDiagnostic.java         | 53 ++++++++++++++++++-
 .../DeprecatedMethods8317Diagnostic.java      |  9 ----
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
index 9ddd8530fb9..05a534060f0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
@@ -30,29 +30,74 @@
 
 import java.util.regex.Pattern;
 
+/**
+ * Абстрактная диагностика, предназначенная для поиска вызова обычных методов и методов глобального контекста
+ * с использованием регулярного выражения.
+ * {@code AbstractFindMethodDiagnostic} предоставляет для переопределения два метода проверки вызовов и один
+ * метод генерации сообщения пользователю.
+ * По умолчанию проверяется, что имя вызываемого метода соответствует переданному в конструкторе регулярному выражению.
+ * <b>Важно:</b> наследование данной диагностики без переопределения {@code getMessage} подразумевает, что первым
+ * параметром сообщения пользователю <b>всегда</b> будет имя найденного метода.
+ */
 public abstract class AbstractFindMethodDiagnostic extends AbstractVisitorDiagnostic {
 
   @Getter
   @Setter
   private Pattern methodPattern;
 
+  /**
+   * Конструктор по умолчанию
+   * @param info служебная информация о диагностике
+   * @param pattern регулярное выражение для проверки
+   */
   AbstractFindMethodDiagnostic(DiagnosticInfo info, Pattern pattern) {
     super(info);
     methodPattern = pattern;
   }
 
+  /**
+   * Проверка контекста глобального метода
+   * @param ctx контекст глобального метода
+   * @return {@code true} если имя метода соответствует регулярному выражению
+   */
   protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     return getMethodPattern().matcher(ctx.methodName().getText()).matches();
   }
 
+  /**
+   * Проверка контекста обычного метода
+   * @param ctx контекст метода
+   * @return {@code true} если имя метода соответствует регулярному выражению
+   */
   protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
     return getMethodPattern().matcher(ctx.methodName().getText()).matches();
   }
 
+  /**
+   * Получает сообщение диагностики для пользователя
+   * @param ctx контекст узла
+   * @return В случае если передан контекст метода, параметризованное сообщение,
+   * первым параметром которого <b>всегда</b> будет имя метода.
+   * В противном случае возвращается обычное сообщение без параметров.
+   */
   protected String getMessage(BSLParserRuleContext ctx) {
-    return info.getMessage(ctx.getText());
+
+    if (ctx instanceof BSLParser.GlobalMethodCallContext) {
+      return info.getMessage(((BSLParser.GlobalMethodCallContext) ctx).methodName().getText());
+    } else if (ctx instanceof BSLParser.MethodCallContext) {
+      return info.getMessage(((BSLParser.MethodCallContext) ctx).methodName().getText());
+    } else {
+      return info.getMessage();
+    }
+
   }
 
+  /**
+   * Обработчик узла глобального метода. Добавляет информацию о сработавшей диагностике
+   * в случае если проверка метода возвращает {@code true}
+   * @param ctx контекст гломабльного метода
+   * @return результат посещения ноды по умолчанию.
+   */
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
@@ -63,6 +108,12 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     return super.visitGlobalMethodCall(ctx);
   }
 
+  /**
+   * Обработчик узла обычного метода. Добавляет информацию о сработавшей диагностике
+   * в случае если проверка метода возвращает {@code true}
+   * @param ctx контекст метода
+   * @return результат посещения ноды по умолчанию.
+   */
   @Override
   public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
index 098a93f28c7..c4fe85f37e5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -29,7 +29,6 @@
 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.bsl.parser.BSLParserRuleContext;
 
 import java.util.regex.Pattern;
 
@@ -62,12 +61,4 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
     return false;
   }
 
-  @Override
-  protected String getMessage(BSLParserRuleContext ctx) {
-    if (ctx instanceof BSLParser.GlobalMethodCallContext) {
-      return info.getMessage(((BSLParser.GlobalMethodCallContext) ctx).methodName().getText());
-    }
-
-    return "";
-  }
 }

From d2a76fe26b226e59b8cfbcb4b54cd9a47510e4fb Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Sun, 3 May 2020 14:55:50 +0300
Subject: [PATCH 242/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20=D1=81=D0=BE=D0=BD=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsafeSafeModeMethodCallDiagnostic.java        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 77145d8d86e..1cac49560e0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -65,13 +65,15 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
   @Override
   protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
-    if (!SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
-      return false;
-    }
+    BSLParserRuleContext rootIfNode = null;
+    BSLParserRuleContext rootExpressionNode = null;
+    BSLParserRuleContext currentRootMember = null;
 
-    BSLParserRuleContext rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
-    BSLParserRuleContext rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
-    BSLParserRuleContext currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    if (SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
+      rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
+      rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
+      currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    }
 
     if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
       return false;

From 12f2b29648b2245cede168a9b12ab00dcad72884 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Sun, 3 May 2020 15:40:21 +0300
Subject: [PATCH 243/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/AbstractFindMethodDiagnostic.java         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
index 05a534060f0..4e2d097f7f2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractFindMethodDiagnostic.java
@@ -94,8 +94,9 @@ protected String getMessage(BSLParserRuleContext ctx) {
 
   /**
    * Обработчик узла глобального метода. Добавляет информацию о сработавшей диагностике
-   * в случае если проверка метода возвращает {@code true}
-   * @param ctx контекст гломабльного метода
+   * в случае если проверка метода {@link AbstractFindMethodDiagnostic#checkGlobalMethodCall(BSLParser.GlobalMethodCallContext)}
+   * возвращает {@code true}
+   * @param ctx контекст глобального метода
    * @return результат посещения ноды по умолчанию.
    */
   @Override
@@ -110,7 +111,8 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
   /**
    * Обработчик узла обычного метода. Добавляет информацию о сработавшей диагностике
-   * в случае если проверка метода возвращает {@code true}
+   * в случае если проверка метода {@link AbstractFindMethodDiagnostic#checkMethodCall(BSLParser.MethodCallContext)}
+   * возвращает {@code true}
    * @param ctx контекст метода
    * @return результат посещения ноды по умолчанию.
    */

From 942cc1d4897b8aebcac22f59e40603bb9f049b77 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sun, 3 May 2020 17:31:43 +0300
Subject: [PATCH 244/444] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20getDescendants?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Единоразовое создание List для хранения результата дает ускорение примерно в 4 раза.
---
 .../_1c_syntax/bsl/languageserver/utils/Trees.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
index 2ce462cf19e..72ac052e999 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
@@ -74,7 +74,18 @@ public static Collection<ParseTree> findAllTokenNodes(ParseTree t, int ttype) {
   }
 
   public static List<ParseTree> getDescendants(ParseTree t) {
-    return org.antlr.v4.runtime.tree.Trees.getDescendants(t);
+    List<ParseTree> nodes = new ArrayList<>(t.getChildCount());
+    flatten(t, nodes);
+    return nodes;
+  }
+
+  private static void flatten(ParseTree t, List<ParseTree> flatList) {
+    flatList.add(t);
+
+    int n = t.getChildCount();
+    for (int i = 0; i < n; i++) {
+      flatten(t.getChild(i), flatList);
+    }
   }
 
   /**

From 2179f6858415b6a2bae860534e08721b12f22934 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 4 May 2020 20:45:28 +0300
Subject: [PATCH 245/444] =?UTF-8?q?=D0=98=D0=BD=D1=84=D0=BE=D1=80=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BE=20=D1=82=D0=BE=D0=BC,=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=20?=
 =?UTF-8?q?=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20deprecated?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/MethodSymbolComputer.java        |  8 ++++++-
 .../context/symbol/MethodDescription.java     | 18 +++++++++++++++
 .../context/symbol/MethodSymbol.java          |  2 ++
 .../providers/DocumentSymbolProvider.java     | 10 +++++++++
 .../computer/MethodSymbolComputerTest.java    | 22 ++++++++++++++++++-
 .../providers/DocumentSymbolProviderTest.java |  8 ++++---
 .../computer/MethodSymbolComputerTest.bsl     | 11 ++++++++++
 .../resources/providers/documentSymbol.bsl    |  4 ++++
 8 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index 9561f672a90..559aba92f1f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -125,13 +125,19 @@ private MethodSymbol createMethodSymbol(
     boolean function,
     boolean export
   ) {
+    Optional<MethodDescription> description = createDescription(startNode.getSymbol());
+    boolean deprecated = description
+      .map(MethodDescription::isDeprecated)
+      .orElse(false);
+
     return MethodSymbol.builder()
       .name(subName.getText())
       .range(Ranges.create(startNode, stopNode))
       .subNameRange(Ranges.create(subName))
       .function(function)
       .export(export)
-      .description(createDescription(startNode.getSymbol()))
+      .description(description)
+      .deprecated(deprecated)
       .parameters(createParameters(paramList))
       .build();
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
index 9b4e117020a..762c3805c70 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
@@ -21,25 +21,39 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context.symbol;
 
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.Getter;
 import org.antlr.v4.runtime.Token;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class MethodDescription {
 
   private static final int COMMENT_LENGTH = 2;
+  private static final Pattern DEPRECATED = CaseInsensitivePattern.compile("(?:\\s*)((?:Устарела|Deprecated)\\..*)");
+
   private final int startLine;
   private final int endLine;
   @Getter
   private final String description;
 
+  @Getter
+  private final String deprecatedInfo;
+
   public MethodDescription(List<Token> comments) {
     description = comments.stream()
       .map(Token::getText)
       .map(MethodDescription::uncomment)
       .collect(Collectors.joining("\n"));
+    Matcher matcher = DEPRECATED.matcher(description);
+    if (matcher.find()) {
+      deprecatedInfo = matcher.group(1);
+    } else {
+      deprecatedInfo = "";
+    }
 
     if (comments.isEmpty()) {
       startLine = 0;
@@ -55,6 +69,10 @@ public boolean isEmpty() {
     return description.isEmpty();
   }
 
+  public boolean isDeprecated() {
+    return !deprecatedInfo.isEmpty();
+  }
+
   public boolean contains(Token first, Token last) {
     int firstLine = first.getLine();
     int lastLine = last.getLine();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
index 337583fadaa..46b94f8d48e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
@@ -57,6 +57,8 @@ public class MethodSymbol implements Symbol {
   boolean export;
   Optional<MethodDescription> description;
 
+  boolean deprecated;
+
   @Builder.Default
   List<ParameterDefinition> parameters = new ArrayList<>();
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
index f2da3cd6d07..3c2afcd8747 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
@@ -67,6 +67,7 @@ private static DocumentSymbol toDocumentSymbol(Symbol symbol) {
       .map(DocumentSymbolProvider::toDocumentSymbol)
       .collect(Collectors.toList());
 
+    documentSymbol.setDeprecated(getDeprecated(symbol));
     documentSymbol.setChildren(children);
 
     return documentSymbol;
@@ -86,4 +87,13 @@ private static Range getSelectionRange(Symbol symbol) {
     return selectionRange;
   }
 
+  private static boolean getDeprecated(Symbol symbol) {
+    boolean deprecated;
+    if (symbol instanceof MethodSymbol) {
+      deprecated = ((MethodSymbol) symbol).isDeprecated();
+    } else {
+      deprecated = false;
+    }
+    return deprecated;
+  }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index 1c4a6d36fa4..c8cf325fdb4 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -40,7 +40,7 @@ void testMethodSymbolComputer() {
     DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/computer/MethodSymbolComputerTest.bsl");
     List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
 
-    assertThat(methods.size()).isEqualTo(3);
+    assertThat(methods.size()).isEqualTo(5);
 
     assertThat(methods.get(0).getName()).isEqualTo("Один");
     assertThat(methods.get(0).getDescription().orElse(null)).isNull();
@@ -79,6 +79,26 @@ void testParameters() {
 
   }
 
+  @Test
+  void testDeprecated() {
+    DocumentContext documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/computer/MethodSymbolComputerTest.bsl");
+    List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
+
+    MethodSymbol methodSymbol = methods.get(2);
+
+    assertThat(methodSymbol.isDeprecated()).isFalse();
+
+    methodSymbol = methods.get(3);
+
+    assertThat(methodSymbol.isDeprecated()).isTrue();
+    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecatedInfo()).isNotEmpty();
+
+    methodSymbol = methods.get(4);
+
+    assertThat(methodSymbol.isDeprecated()).isTrue();
+    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecatedInfo()).isNotEmpty();
+  }
+
   @Test
   void testParseError() {
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProviderTest.java
index ab0b9876b91..1ae37babd16 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProviderTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProviderTest.java
@@ -43,7 +43,7 @@ void testDocumentSymbol() {
 
     List<Either<SymbolInformation, DocumentSymbol>> documentSymbols = DocumentSymbolProvider.getDocumentSymbols(documentContext);
 
-    assertThat(documentSymbols).hasSize(8);
+    assertThat(documentSymbols).hasSize(9);
 
     // global variables
     assertThat(documentSymbols)
@@ -58,12 +58,14 @@ void testDocumentSymbol() {
     // methods
     assertThat(documentSymbols)
       .filteredOn(documentSymbol -> documentSymbol.getRight().getKind().equals(SymbolKind.Method))
-      .hasSize(3)
+      .hasSize(4)
       .extracting(Either::getRight)
       .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(4, 0, 5, 14)))
       .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(7, 0, 8, 12)))
       .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(10, 0, 13, 14)))
-      .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(10, 0, 13, 14)))
+      .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(47, 0, 48, 12)))
+      .filteredOn(DocumentSymbol::getDeprecated)
+      .anyMatch(documentSymbol -> documentSymbol.getRange().equals(Ranges.create(47, 0, 48, 12)))
     ;
 
     // sub vars
diff --git a/src/test/resources/context/computer/MethodSymbolComputerTest.bsl b/src/test/resources/context/computer/MethodSymbolComputerTest.bsl
index 373be805b44..0bfb724211e 100644
--- a/src/test/resources/context/computer/MethodSymbolComputerTest.bsl
+++ b/src/test/resources/context/computer/MethodSymbolComputerTest.bsl
@@ -17,3 +17,14 @@
 КонецФункции
 
 #КонецОбласти
+
+// Устарела.
+//
+Функция Четыре()
+КонецФункции
+
+// Описание
+// Устарела. См. функцию Три()
+//
+Функция Пять()
+КонецФункции
diff --git a/src/test/resources/providers/documentSymbol.bsl b/src/test/resources/providers/documentSymbol.bsl
index f37467ddd3d..594cd6bbdcc 100644
--- a/src/test/resources/providers/documentSymbol.bsl
+++ b/src/test/resources/providers/documentSymbol.bsl
@@ -44,4 +44,8 @@
 
 #КонецОбласти
 
+// Устарела.
+Функция УстаревшаяФункция()
+КонецФункции
+
 А = 0;

From fe382eda6b2d1587be55e2133adc5c32b26366bc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 4 May 2020 21:19:29 +0300
Subject: [PATCH 246/444] =?UTF-8?q?=D0=98=D0=B7=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=20ParseTree=20=D0=B2=20?=
 =?UTF-8?q?Symbol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/DocumentContext.java              |  4 ---
 .../computer/RegionSymbolComputer.java        | 29 +++----------------
 .../context/symbol/RegionSymbol.java          | 15 ++--------
 .../languageserver/context/symbol/Symbol.java |  3 --
 .../diagnostics/EmptyRegionDiagnostic.java    | 26 ++++++++++++++++-
 5 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index c6806778b40..f0491ddfa1e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -28,7 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.context.computer.DiagnosticIgnoranceComputer;
 import com.github._1c_syntax.bsl.languageserver.context.computer.SymbolTreeComputer;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
-import com.github._1c_syntax.bsl.languageserver.context.symbol.Symbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
@@ -207,9 +206,6 @@ public void clearSecondaryData() {
     contentList.clear();
     tokenizer = null;
 
-    if (symbolTree.isPresent()) {
-      getSymbolTree().getChildrenFlat().forEach(Symbol::clearParseTreeData);
-    }
     cognitiveComplexityData.clear();
     cyclomaticComplexityData.clear();
     metrics.clear();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
index b0179f21738..b4a15c7f6cc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
@@ -24,10 +24,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
-import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserBaseVisitor;
-import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.lsp4j.Range;
@@ -36,7 +34,6 @@
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public final class RegionSymbolComputer
   extends BSLParserBaseVisitor<ParseTree>
@@ -45,7 +42,6 @@ public final class RegionSymbolComputer
   private final DocumentContext documentContext;
   private final Deque<Pair<RegionSymbol.RegionSymbolBuilder, BSLParser.RegionStartContext>> regionStack = new ArrayDeque<>();
   private final List<RegionSymbol> regions = new ArrayList<>();
-  private final List<BSLParserRuleContext> allNodes = new ArrayList<>();
 
   public RegionSymbolComputer(DocumentContext documentContext) {
     this.documentContext = documentContext;
@@ -55,21 +51,15 @@ public RegionSymbolComputer(DocumentContext documentContext) {
   public List<RegionSymbol> compute() {
     regionStack.clear();
     regions.clear();
-    allNodes.clear();
-
-    Trees.getDescendants(documentContext.getAst()).stream()
-      .filter(node -> node instanceof BSLParserRuleContext)
-      .map(node -> (BSLParserRuleContext) node)
-      .filter(node -> (node.getStop() != null)
-        && (node.getStart() != null))
-      .collect(Collectors.toCollection(() -> allNodes));
 
     visitFile(documentContext.getAst());
 
     regionStack.clear();
-    allNodes.clear();
 
-    return new ArrayList<>(regions);
+    List<RegionSymbol> result = new ArrayList<>(regions);
+    regions.clear();
+
+    return result;
   }
 
   @Override
@@ -102,17 +92,6 @@ public ParseTree visitRegionEnd(BSLParser.RegionEndContext ctx) {
       .endRange(Ranges.create(ctx))
     ;
 
-    // zero-based ranges
-    int regionStartLine = range.getStart().getLine() + 1;
-    int regionEndLine = range.getEnd().getLine() + 1;
-    List<BSLParserRuleContext> regionNodes = allNodes.stream()
-      .filter(node ->
-        node.getStart().getLine() > regionStartLine
-          && node.getStart().getLine() < regionEndLine)
-      .collect(Collectors.toList());
-
-    builder.nodes(regionNodes);
-
     RegionSymbol region = builder.build();
 
     regions.add(region);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
index 0b0ac4847ac..2367b5878b3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/RegionSymbol.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context.symbol;
 
-import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
@@ -39,8 +38,8 @@
 
 @Value
 @Builder(access = AccessLevel.PUBLIC)
-@EqualsAndHashCode(exclude = {"children", "parent", "nodes"})
-@ToString(exclude = {"children", "parent", "nodes"})
+@EqualsAndHashCode(exclude = {"children", "parent"})
+@ToString(exclude = {"children", "parent"})
 public class RegionSymbol implements Symbol {
   String name;
   Range range;
@@ -57,16 +56,6 @@ public class RegionSymbol implements Symbol {
   @Builder.Default
   List<Symbol> children = new ArrayList<>();
 
-  @NonFinal
-  @Builder.Default
-  // TODO подумать, как избавиться от этого
-    List<BSLParserRuleContext> nodes = new ArrayList<>();
-
-  @Override
-  public void clearParseTreeData() {
-    nodes = null;
-  }
-
   public List<MethodSymbol> getMethods() {
     return children.stream()
       .filter(MethodSymbol.class::isInstance)
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
index 87638ac472e..0f14318b764 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/Symbol.java
@@ -41,9 +41,6 @@ public interface Symbol {
 
   List<Symbol> getChildren();
 
-  default void clearParseTreeData() {
-  }
-
   default Optional<Symbol> getRootParent() {
     return getParent().flatMap(Symbol::getRootParent).or(() -> Optional.of(this));
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index a8d3c5e5624..310f46641c4 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -29,7 +29,9 @@
 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.providers.CodeActionProvider;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -43,6 +45,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -61,17 +64,38 @@ public class EmptyRegionDiagnostic extends AbstractDiagnostic implements QuickFi
     BSLParser.RULE_preprocessor
   );
 
+  private final List<BSLParserRuleContext> allNodes = new ArrayList<>();
+
   public EmptyRegionDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
   protected void check(DocumentContext documentContext) {
+
+    allNodes.clear();
+
+    Trees.getDescendants(documentContext.getAst()).stream()
+      .filter(node -> node instanceof BSLParserRuleContext)
+      .map(node -> (BSLParserRuleContext) node)
+      .filter(node -> (node.getStop() != null)
+        && (node.getStart() != null))
+      .collect(Collectors.toCollection(() -> allNodes));
+
     documentContext.getSymbolTree().getRegionsFlat().forEach(this::checkRegion);
+
+    allNodes.clear();
   }
 
   private void checkRegion(RegionSymbol region) {
-    var hasChildren = region.getNodes().stream()
+    // zero-based ranges
+    int startLine = region.getStartRange().getStart().getLine() + 1;
+    int endLine = region.getEndRange().getEnd().getLine() + 1;
+
+    var hasChildren = allNodes.stream()
+      .filter(node ->
+        node.getStart().getLine() > startLine
+          && node.getStart().getLine() < endLine)
       .map(RuleContext::getRuleIndex)
       .filter(ruleIndex -> !REGIONS_NODE_INDEXES.contains(ruleIndex))
       .findAny();

From d1105173025d9e4ceebf632f73c8814ea95e7ad2 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 5 May 2020 03:14:55 +0300
Subject: [PATCH 247/444] Cleanup diagnostic for EmptyRegion

---
 .../diagnostics/EmptyRegionDiagnostic.java    | 110 ++++++++++--------
 .../EmptyRegionDiagnosticTest.java            |   5 +-
 2 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index 310f46641c4..d52597088b7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -29,10 +29,13 @@
 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.providers.CodeActionProvider;
-import com.github._1c_syntax.bsl.languageserver.utils.Trees;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.parser.BSLParser;
-import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
-import org.antlr.v4.runtime.RuleContext;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.ParseTreeWalker;
+import org.antlr.v4.runtime.tree.TerminalNode;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.Diagnostic;
@@ -40,12 +43,12 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextEdit;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Deque;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -57,55 +60,14 @@
 )
 public class EmptyRegionDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
-  private static final Set<Integer> REGIONS_NODE_INDEXES = Set.of(
-    BSLParser.RULE_regionName,
-    BSLParser.RULE_regionStart,
-    BSLParser.RULE_regionEnd,
-    BSLParser.RULE_preprocessor
-  );
-
-  private final List<BSLParserRuleContext> allNodes = new ArrayList<>();
-
   public EmptyRegionDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
   protected void check(DocumentContext documentContext) {
-
-    allNodes.clear();
-
-    Trees.getDescendants(documentContext.getAst()).stream()
-      .filter(node -> node instanceof BSLParserRuleContext)
-      .map(node -> (BSLParserRuleContext) node)
-      .filter(node -> (node.getStop() != null)
-        && (node.getStart() != null))
-      .collect(Collectors.toCollection(() -> allNodes));
-
-    documentContext.getSymbolTree().getRegionsFlat().forEach(this::checkRegion);
-
-    allNodes.clear();
-  }
-
-  private void checkRegion(RegionSymbol region) {
-    // zero-based ranges
-    int startLine = region.getStartRange().getStart().getLine() + 1;
-    int endLine = region.getEndRange().getEnd().getLine() + 1;
-
-    var hasChildren = allNodes.stream()
-      .filter(node ->
-        node.getStart().getLine() > startLine
-          && node.getStart().getLine() < endLine)
-      .map(RuleContext::getRuleIndex)
-      .filter(ruleIndex -> !REGIONS_NODE_INDEXES.contains(ruleIndex))
-      .findAny();
-
-    if (hasChildren.isEmpty()) {
-      diagnosticStorage.addDiagnostic(
-        region.getStartRange(),
-        info.getMessage(region.getName())
-      );
-    }
+    ParseTreeWalker walker = new ParseTreeWalker();
+    walker.walk(new RegionChecker(), documentContext.getAst());
   }
 
   @Override
@@ -150,8 +112,7 @@ public List<CodeAction> getQuickFixes(
 
       Range range = new Range(diagnosticRangeStart, diagnosticRangeEnd);
 
-      TextEdit textEdit = new TextEdit(range, "");
-      textEdits.add(textEdit);
+      textEdits.add(new TextEdit(range, ""));
 
     }
 
@@ -162,5 +123,54 @@ public List<CodeAction> getQuickFixes(
       diagnostics
     );
   }
+
+  private class RegionChecker implements ParseTreeListener {
+    int currentRegionLevel = 0;
+    int currentUsageLevel = 0;
+    Deque<BSLParser.RegionStartContext> regions = new ArrayDeque<>();
+
+    @Override
+    public void visitTerminal(TerminalNode node) {
+      // nothing to do
+    }
+
+    @Override
+    public void visitErrorNode(ErrorNode node) {
+      // nothing to do
+    }
+
+    @Override
+    public void enterEveryRule(ParserRuleContext ctx) {
+      if (ctx instanceof BSLParser.RegionStartContext) {
+        currentRegionLevel++;
+        regions.push((BSLParser.RegionStartContext) ctx);
+      } else if (ctx instanceof BSLParser.PreprocessorContext
+        || ctx instanceof BSLParser.FileContext
+        || ctx instanceof BSLParser.RegionNameContext
+        || ctx instanceof BSLParser.RegionEndContext) {
+        //ignore
+      } else {
+        currentUsageLevel = Math.max(currentUsageLevel, currentRegionLevel);
+      }
+    }
+
+    @Override
+    public void exitEveryRule(ParserRuleContext ctx) {
+      if (ctx instanceof BSLParser.RegionEndContext) {
+        if (!regions.isEmpty()) {
+          BSLParser.RegionStartContext currentRegion = regions.pop();
+          if (currentUsageLevel < currentRegionLevel) {
+            diagnosticStorage.addDiagnostic(
+              Ranges.create(currentRegion),
+              info.getMessage(currentRegion.regionName().getText())
+            );
+          } else if (currentRegionLevel == currentUsageLevel) {
+            currentUsageLevel--;
+          }
+          currentRegionLevel--;
+        }
+      }
+    }
+  }
 }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
index 5f3eb542f7e..9dea99d9aa7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
@@ -51,7 +51,8 @@ void test() {
 
   @Test
   void testQuickFix() {
-
+    // TODO Some bad code happens
+    /*
     final DocumentContext documentContext = getDocumentContext();
     List<Diagnostic> diagnostics = getDiagnostics();
     final Diagnostic externalRegionDiagnostic = diagnostics.get(1);
@@ -76,6 +77,6 @@ void testQuickFix() {
       .in(documentContext)
       .hasChanges(1)
       .hasNewText("");
-
+*/
   }
 }

From 2e2739c588350daf6db6a4d6c3b66ff805315dd5 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 5 May 2020 03:26:38 +0300
Subject: [PATCH 248/444] Fix test by change order...

---
 .../diagnostics/EmptyRegionDiagnosticTest.java           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
index 9dea99d9aa7..a7f6d9ccfe8 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
@@ -51,12 +51,11 @@ void test() {
 
   @Test
   void testQuickFix() {
-    // TODO Some bad code happens
-    /*
+
     final DocumentContext documentContext = getDocumentContext();
     List<Diagnostic> diagnostics = getDiagnostics();
-    final Diagnostic externalRegionDiagnostic = diagnostics.get(1);
-    final Diagnostic internalRegionDiagnostic = diagnostics.get(2);
+    final Diagnostic externalRegionDiagnostic = diagnostics.get(2);
+    final Diagnostic internalRegionDiagnostic = diagnostics.get(1);
 
     List<CodeAction> quickFixes = getQuickFixes(externalRegionDiagnostic);
     assertThat(quickFixes).hasSize(1);
@@ -77,6 +76,6 @@ void testQuickFix() {
       .in(documentContext)
       .hasChanges(1)
       .hasNewText("");
-*/
+
   }
 }

From c381959f5a32c1d400856ae42cda80419ef2385f Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 5 May 2020 10:27:36 +0300
Subject: [PATCH 249/444] Remove inner listener in EmptyRegionDiagnostic

---
 .../diagnostics/EmptyRegionDiagnostic.java    | 90 +++++++------------
 1 file changed, 34 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index d52597088b7..fc8b88a31b9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -32,10 +32,6 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ErrorNode;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import org.antlr.v4.runtime.tree.TerminalNode;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.Diagnostic;
@@ -58,16 +54,46 @@
     DiagnosticTag.STANDARD
   }
 )
-public class EmptyRegionDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
+public class EmptyRegionDiagnostic extends AbstractListenerDiagnostic implements QuickFixProvider {
+  int currentRegionLevel = 0;
+  int currentUsageLevel = 0;
+  Deque<BSLParser.RegionStartContext> regions = new ArrayDeque<>();
 
   public EmptyRegionDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
-    ParseTreeWalker walker = new ParseTreeWalker();
-    walker.walk(new RegionChecker(), documentContext.getAst());
+  public void enterEveryRule(ParserRuleContext ctx) {
+    if (ctx instanceof BSLParser.RegionStartContext) {
+      currentRegionLevel++;
+      regions.push((BSLParser.RegionStartContext) ctx);
+    } else if (ctx instanceof BSLParser.PreprocessorContext
+      || ctx instanceof BSLParser.FileContext
+      || ctx instanceof BSLParser.RegionNameContext
+      || ctx instanceof BSLParser.RegionEndContext) {
+      //ignore
+    } else {
+      currentUsageLevel = Math.max(currentUsageLevel, currentRegionLevel);
+    }
+  }
+
+  @Override
+  public void exitEveryRule(ParserRuleContext ctx) {
+    if (ctx instanceof BSLParser.RegionEndContext) {
+      if (!regions.isEmpty()) {
+        BSLParser.RegionStartContext currentRegion = regions.pop();
+        if (currentUsageLevel < currentRegionLevel) {
+          diagnosticStorage.addDiagnostic(
+            Ranges.create(currentRegion),
+            info.getMessage(currentRegion.regionName().getText())
+          );
+        } else if (currentRegionLevel == currentUsageLevel) {
+          currentUsageLevel--;
+        }
+        currentRegionLevel--;
+      }
+    }
   }
 
   @Override
@@ -124,53 +150,5 @@ public List<CodeAction> getQuickFixes(
     );
   }
 
-  private class RegionChecker implements ParseTreeListener {
-    int currentRegionLevel = 0;
-    int currentUsageLevel = 0;
-    Deque<BSLParser.RegionStartContext> regions = new ArrayDeque<>();
-
-    @Override
-    public void visitTerminal(TerminalNode node) {
-      // nothing to do
-    }
-
-    @Override
-    public void visitErrorNode(ErrorNode node) {
-      // nothing to do
-    }
-
-    @Override
-    public void enterEveryRule(ParserRuleContext ctx) {
-      if (ctx instanceof BSLParser.RegionStartContext) {
-        currentRegionLevel++;
-        regions.push((BSLParser.RegionStartContext) ctx);
-      } else if (ctx instanceof BSLParser.PreprocessorContext
-        || ctx instanceof BSLParser.FileContext
-        || ctx instanceof BSLParser.RegionNameContext
-        || ctx instanceof BSLParser.RegionEndContext) {
-        //ignore
-      } else {
-        currentUsageLevel = Math.max(currentUsageLevel, currentRegionLevel);
-      }
-    }
-
-    @Override
-    public void exitEveryRule(ParserRuleContext ctx) {
-      if (ctx instanceof BSLParser.RegionEndContext) {
-        if (!regions.isEmpty()) {
-          BSLParser.RegionStartContext currentRegion = regions.pop();
-          if (currentUsageLevel < currentRegionLevel) {
-            diagnosticStorage.addDiagnostic(
-              Ranges.create(currentRegion),
-              info.getMessage(currentRegion.regionName().getText())
-            );
-          } else if (currentRegionLevel == currentUsageLevel) {
-            currentUsageLevel--;
-          }
-          currentRegionLevel--;
-        }
-      }
-    }
-  }
 }
 

From 2f90b46a4af443560caee91807bc57befb3aa53a Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Tue, 5 May 2020 12:34:32 +0300
Subject: [PATCH 250/444] Simplify quick fix for EmptyRegionDiagnostic.

---
 .../diagnostics/EmptyRegionDiagnostic.java    | 57 +++----------------
 .../EmptyRegionDiagnosticTest.java            |  6 +-
 2 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index fc8b88a31b9..b3c6f258823 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -22,7 +22,6 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
-import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 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;
@@ -35,16 +34,12 @@
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextEdit;
 
 import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Deque;
 import java.util.List;
-import java.util.Optional;
+import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -69,12 +64,11 @@ public void enterEveryRule(ParserRuleContext ctx) {
       currentRegionLevel++;
       regions.push((BSLParser.RegionStartContext) ctx);
     } else if (ctx instanceof BSLParser.PreprocessorContext
-      || ctx instanceof BSLParser.FileContext
       || ctx instanceof BSLParser.RegionNameContext
       || ctx instanceof BSLParser.RegionEndContext) {
       //ignore
-    } else {
-      currentUsageLevel = Math.max(currentUsageLevel, currentRegionLevel);
+    } else if (currentUsageLevel < currentRegionLevel) {
+      currentUsageLevel = currentRegionLevel;
     }
   }
 
@@ -85,7 +79,7 @@ public void exitEveryRule(ParserRuleContext ctx) {
         BSLParser.RegionStartContext currentRegion = regions.pop();
         if (currentUsageLevel < currentRegionLevel) {
           diagnosticStorage.addDiagnostic(
-            Ranges.create(currentRegion),
+            Ranges.create(currentRegion.getParent(), ctx),
             info.getMessage(currentRegion.regionName().getText())
           );
         } else if (currentRegionLevel == currentUsageLevel) {
@@ -102,45 +96,10 @@ public List<CodeAction> getQuickFixes(
     CodeActionParams params,
     DocumentContext documentContext
   ) {
-    diagnostics.sort(Comparator.comparingInt(o -> o.getRange().getStart().getLine()));
-    List<TextEdit> textEdits = new ArrayList<>();
-    int maxDiagnosticEndLine = 0;
-
-    for (Diagnostic diagnostic : diagnostics) {
-
-      int diagnosticStartLine = diagnostic.getRange().getStart().getLine();
-
-      Optional<RegionSymbol> optionalRegionSymbol = documentContext.getSymbolTree().getRegionsFlat()
-        .stream()
-        .filter(regionSymbol -> regionSymbol.getRange().getStart().getLine() == diagnosticStartLine)
-        .findFirst();
-      if (optionalRegionSymbol.isEmpty()) {
-        continue;
-      }
-      RegionSymbol region = optionalRegionSymbol.get();
-
-      int diagnosticEndLine = region.getRange().getEnd().getLine() - 1;
-      if (diagnosticEndLine < maxDiagnosticEndLine) {
-        continue;
-      }
-
-      if (maxDiagnosticEndLine == 0 || diagnosticEndLine > maxDiagnosticEndLine) {
-        maxDiagnosticEndLine = diagnosticEndLine;
-      }
-
-      int diagnosticStartCharacter = diagnostic.getRange().getStart().getCharacter() - 1;
-      Position diagnosticRangeStart = new Position(diagnosticStartLine, diagnosticStartCharacter);
-
-      Position diagnosticRangeEnd = new Position(
-        diagnosticEndLine + 1,
-        0
-      );
-
-      Range range = new Range(diagnosticRangeStart, diagnosticRangeEnd);
-
-      textEdits.add(new TextEdit(range, ""));
-
-    }
+    List<TextEdit> textEdits = diagnostics
+      .stream()
+      .map(diagnostic -> new TextEdit(diagnostic.getRange(), ""))
+      .collect(Collectors.toList());
 
     return CodeActionProvider.createCodeActions(
       textEdits,
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
index a7f6d9ccfe8..35f170075a2 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnosticTest.java
@@ -42,9 +42,9 @@ void test() {
 
     assertThat(diagnostics).hasSize(3);
     assertThat(diagnostics, true)
-      .hasRange(0, 1, 13)
-      .hasRange(10, 1, 23)
-      .hasRange(12, 1, 26)
+      .hasRange(0, 0, 2, 13)
+      .hasRange(10, 0, 15, 13)
+      .hasRange(12, 0, 14, 13)
     ;
 
   }

From 6400001a0e59e536c289710e211855de3175dea5 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Wed, 6 May 2020 07:32:42 +0300
Subject: [PATCH 251/444] Fix "Quick fix all" operation. Remove warning with
 empty statements.

---
 .../diagnostics/EmptyRegionDiagnostic.java    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index b3c6f258823..162f8348fb2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -37,9 +37,10 @@
 import org.eclipse.lsp4j.TextEdit;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -63,11 +64,10 @@ public void enterEveryRule(ParserRuleContext ctx) {
     if (ctx instanceof BSLParser.RegionStartContext) {
       currentRegionLevel++;
       regions.push((BSLParser.RegionStartContext) ctx);
-    } else if (ctx instanceof BSLParser.PreprocessorContext
+    } else if (! (ctx instanceof BSLParser.PreprocessorContext
       || ctx instanceof BSLParser.RegionNameContext
-      || ctx instanceof BSLParser.RegionEndContext) {
-      //ignore
-    } else if (currentUsageLevel < currentRegionLevel) {
+      || ctx instanceof BSLParser.RegionEndContext)
+      && currentUsageLevel < currentRegionLevel) {
       currentUsageLevel = currentRegionLevel;
     }
   }
@@ -96,10 +96,20 @@ public List<CodeAction> getQuickFixes(
     CodeActionParams params,
     DocumentContext documentContext
   ) {
-    List<TextEdit> textEdits = diagnostics
+    List<TextEdit> textEdits = new ArrayList<>(diagnostics.size());
+    diagnostics
       .stream()
-      .map(diagnostic -> new TextEdit(diagnostic.getRange(), ""))
-      .collect(Collectors.toList());
+      .map(Diagnostic::getRange)
+      .sorted(Comparator.comparingInt(o -> o.getStart().getLine()))
+      .reduce((prev, curr) -> {
+        if (prev.getEnd().getLine() > curr.getStart().getLine()) {
+          return prev;
+        } else {
+          textEdits.add(new TextEdit(prev, ""));
+          return curr;
+        }
+      })
+      .ifPresent(lastRange -> textEdits.add(new TextEdit(lastRange, "")));
 
     return CodeActionProvider.createCodeActions(
       textEdits,
@@ -108,6 +118,4 @@ public List<CodeAction> getQuickFixes(
       diagnostics
     );
   }
-
 }
-

From 96b846cb706cf501e47b0acbbc4fc5fba65e601b Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 13:36:09 +0300
Subject: [PATCH 252/444] Fix qf

---
 .../bsl/languageserver/providers/DocumentSymbolProvider.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
index 3c2afcd8747..3e926e097c1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentSymbolProvider.java
@@ -67,7 +67,7 @@ private static DocumentSymbol toDocumentSymbol(Symbol symbol) {
       .map(DocumentSymbolProvider::toDocumentSymbol)
       .collect(Collectors.toList());
 
-    documentSymbol.setDeprecated(getDeprecated(symbol));
+    documentSymbol.setDeprecated(isDeprecated(symbol));
     documentSymbol.setChildren(children);
 
     return documentSymbol;
@@ -87,7 +87,7 @@ private static Range getSelectionRange(Symbol symbol) {
     return selectionRange;
   }
 
-  private static boolean getDeprecated(Symbol symbol) {
+  private static boolean isDeprecated(Symbol symbol) {
     boolean deprecated;
     if (symbol instanceof MethodSymbol) {
       deprecated = ((MethodSymbol) symbol).isDeprecated();

From 778743d38d4d510cbb81dd91e6ca9130aba187dc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 14:58:17 +0300
Subject: [PATCH 253/444] Fix QF

---
 .../diagnostics/EmptyRegionDiagnostic.java    | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index fc8b88a31b9..9230eb8e968 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -55,9 +55,9 @@
   }
 )
 public class EmptyRegionDiagnostic extends AbstractListenerDiagnostic implements QuickFixProvider {
-  int currentRegionLevel = 0;
-  int currentUsageLevel = 0;
-  Deque<BSLParser.RegionStartContext> regions = new ArrayDeque<>();
+  private int currentRegionLevel;
+  private int currentUsageLevel;
+  private final Deque<BSLParser.RegionStartContext> regions = new ArrayDeque<>();
 
   public EmptyRegionDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -80,19 +80,17 @@ public void enterEveryRule(ParserRuleContext ctx) {
 
   @Override
   public void exitEveryRule(ParserRuleContext ctx) {
-    if (ctx instanceof BSLParser.RegionEndContext) {
-      if (!regions.isEmpty()) {
-        BSLParser.RegionStartContext currentRegion = regions.pop();
-        if (currentUsageLevel < currentRegionLevel) {
-          diagnosticStorage.addDiagnostic(
-            Ranges.create(currentRegion),
-            info.getMessage(currentRegion.regionName().getText())
-          );
-        } else if (currentRegionLevel == currentUsageLevel) {
-          currentUsageLevel--;
-        }
-        currentRegionLevel--;
+    if (ctx instanceof BSLParser.RegionEndContext && !regions.isEmpty()) {
+      BSLParser.RegionStartContext currentRegion = regions.pop();
+      if (currentUsageLevel < currentRegionLevel) {
+        diagnosticStorage.addDiagnostic(
+          Ranges.create(currentRegion),
+          info.getMessage(currentRegion.regionName().getText())
+        );
+      } else if (currentRegionLevel == currentUsageLevel) {
+        currentUsageLevel--;
       }
+      currentRegionLevel--;
     }
   }
 

From 52125fd3ae311854328a9c7f1125a3e69bfca040 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 17:31:02 +0300
Subject: [PATCH 254/444] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20MethodSymbol=20=D0=B2=20SymbolTree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/symbol/SymbolTree.java            | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
index d58da5a8515..55fd568b667 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
@@ -29,7 +29,6 @@
 import org.eclipse.lsp4j.Range;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -39,10 +38,10 @@ public class SymbolTree {
   List<Symbol> children;
 
   public List<Symbol> getChildrenFlat() {
-    return children.stream()
-      .map(this::getSelfAndChildrenRecursive)
-      .flatMap(Collection::stream)
-      .collect(Collectors.toList());
+    List<Symbol> symbols = new ArrayList<>();
+    children.forEach(child -> flatten(child, symbols));
+
+    return symbols;
   }
 
   public <T> List<T> getChildrenFlat(Class<T> clazz) {
@@ -113,16 +112,9 @@ public Optional<VariableSymbol> getVariableSymbol(BSLParserRuleContext ctx) {
       .findAny();
   }
 
-  private List<Symbol> getSelfAndChildrenRecursive(Symbol symbol) {
-    var list = new ArrayList<Symbol>();
-    list.add(symbol);
-
-    symbol.getChildren().stream()
-      .map(this::getSelfAndChildrenRecursive)
-      .flatMap(Collection::stream)
-      .collect(Collectors.toCollection(() -> list));
-
-    return list;
+  private static void flatten(Symbol symbol, List<Symbol> symbols) {
+    symbols.add(symbol);
+    symbol.getChildren().forEach(child -> flatten(child, symbols));
   }
 
 }

From d864741b6cc186635e40d90c1416e279333ef338 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 17:50:25 +0300
Subject: [PATCH 255/444] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/symbol/SymbolTree.java            | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
index 55fd568b667..2a609f1431a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/SymbolTree.java
@@ -25,6 +25,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import lombok.Getter;
 import lombok.Value;
 import org.eclipse.lsp4j.Range;
 
@@ -37,12 +38,11 @@
 public class SymbolTree {
   List<Symbol> children;
 
-  public List<Symbol> getChildrenFlat() {
-    List<Symbol> symbols = new ArrayList<>();
-    children.forEach(child -> flatten(child, symbols));
+  @Getter(lazy = true)
+  List<Symbol> childrenFlat = createChildrenFlat();
 
-    return symbols;
-  }
+  @Getter(lazy = true)
+  List<MethodSymbol> methods = createMethods();
 
   public <T> List<T> getChildrenFlat(Class<T> clazz) {
     return getChildrenFlat().stream()
@@ -62,10 +62,6 @@ public List<RegionSymbol> getRegionsFlat() {
     return getChildrenFlat(RegionSymbol.class);
   }
 
-  public List<MethodSymbol> getMethods() {
-    return getChildrenFlat(MethodSymbol.class);
-  }
-
   public Optional<MethodSymbol> getMethodSymbol(BSLParserRuleContext ctx) {
     BSLParserRuleContext subNameNode;
     if (Trees.nodeContainsErrors(ctx)) {
@@ -112,6 +108,17 @@ public Optional<VariableSymbol> getVariableSymbol(BSLParserRuleContext ctx) {
       .findAny();
   }
 
+  private List<Symbol> createChildrenFlat() {
+    List<Symbol> symbols = new ArrayList<>();
+    getChildren().forEach(child -> flatten(child, symbols));
+
+    return symbols;
+  }
+
+  private List<MethodSymbol> createMethods() {
+    return getChildrenFlat(MethodSymbol.class);
+  }
+
   private static void flatten(Symbol symbol, List<Symbol> symbols) {
     symbols.add(symbol);
     symbol.getChildren().forEach(child -> flatten(child, symbols));

From d3d4c44fe5157f854a3d3656e1abe3f39d2d33bc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 17:58:28 +0300
Subject: [PATCH 256/444] =?UTF-8?q?=D0=A1=D1=82=D0=B0=D1=80=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?case=20insensetivity=20=D0=B2=20=D0=BF=D0=B0=D1=80=D1=81=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d5df81751b2..d9860190cf2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "01cc1512e10b667a0ec3fdd2307ca0221bf52684") {
+    implementation("com.github.1c-syntax", "bsl-parser", "57e4b9574b") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")

From 6e1a862653752d2036aaadbb850968201a3de492 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Wed, 6 May 2020 19:22:12 +0300
Subject: [PATCH 257/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=89=D0=B5=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=82=D0=B5=D1=81=D1=82-=D0=BA=D0=B5=D0=B9=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

воспользовался штатным методов сравнения с регуляркой
ускорил работу правила
---
 .../UnsafeSafeModeMethodCallDiagnostic.java   | 27 +++++++++++++------
 .../bsl/languageserver/utils/Trees.java       | 27 +++++++++++++++----
 ...nsafeSafeModeMethodCallDiagnosticTest.java |  5 ++--
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 1cac49560e0..ac25c27a844 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -32,6 +32,8 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
@@ -52,6 +54,10 @@ public class UnsafeSafeModeMethodCallDiagnostic extends AbstractFindMethodDiagno
     "(БезопасныйРежим|SafeMode)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
   );
+  private static final List<Integer> ROOT_LIST = Arrays.asList(
+    BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch, BSLParser.RULE_codeBlock);
+  private static final List<Integer> IF_BRANCHES = Arrays.asList(
+    BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch);
 
   public UnsafeSafeModeMethodCallDiagnostic(DiagnosticInfo info) {
     super(info, SAFE_MODE_METHOD_NAME);
@@ -65,22 +71,27 @@ protected boolean checkMethodCall(BSLParser.MethodCallContext ctx) {
   @Override
   protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
-    BSLParserRuleContext rootIfNode = null;
-    BSLParserRuleContext rootExpressionNode = null;
-    BSLParserRuleContext currentRootMember = null;
+    if (!super.checkGlobalMethodCall(ctx)){
+      return false;
+    }
 
-    if (SAFE_MODE_METHOD_NAME.matcher(ctx.methodName().getText()).matches()) {
-      rootIfNode = Trees.getRootParent(ctx, BSLParser.RULE_ifStatement);
-      rootExpressionNode = Trees.getRootParent(ctx, BSLParser.RULE_expression);
-      currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    BSLParserRuleContext currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    if (currentRootMember == null) {
+      return false;
+    }
+    BSLParserRuleContext rootExpressionNode = Trees.getRootParent(currentRootMember, BSLParser.RULE_expression);
+    if (rootExpressionNode == null) {
+      return false;
     }
 
-    if (rootIfNode == null || rootExpressionNode == null || currentRootMember == null) {
+    BSLParserRuleContext rootIfNode = Trees.getRootParent(rootExpressionNode, ROOT_LIST);
+    if (rootIfNode == null || !IF_BRANCHES.contains(rootIfNode.getRuleIndex())) {
       return false;
     }
 
     int indexOfCurrentMemberNode = rootExpressionNode.children.indexOf(currentRootMember);
     if (indexOfCurrentMemberNode != rootExpressionNode.getChildCount() - 1) {
+
       var nextNode = rootExpressionNode.children.get(indexOfCurrentMemberNode + 1);
       return !(Trees.nodeContains(nextNode, BSLParser.RULE_compareOperation));
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
index 72ac052e999..d4b9ca77584 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
@@ -222,17 +222,34 @@ public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc) {
   }
 
   /**
-   * Рекурсивно находит самого верхнего родителя текущей ноды нужно типа
+   * Рекурсивно находит самого верхнего родителя текущей ноды нужного типа
    */
   public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, int ruleindex) {
-    if (tnc.getParent() == null) {
+    final var parent = tnc.getParent();
+    if (parent == null) {
+      return null;
+    }
+
+    if (getRuleIndex(parent) == ruleindex) {
+      return (BSLParserRuleContext) parent;
+    } else {
+      return getRootParent((BSLParserRuleContext) parent, ruleindex);
+    }
+  }
+
+  /**
+   * Рекурсивно находит самого верхнего родителя текущей ноды одного из нужных типов
+   */
+  public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, List<Integer> indexes) {
+    final var parent = tnc.getParent();
+    if (parent == null) {
       return null;
     }
 
-    if (getRuleIndex(tnc.getParent()) == ruleindex) {
-      return (BSLParserRuleContext) tnc.getParent();
+    if (indexes.contains(getRuleIndex(parent))) {
+      return (BSLParserRuleContext) parent;
     } else {
-      return getRootParent((BSLParserRuleContext) tnc.getParent(), ruleindex);
+      return getRootParent((BSLParserRuleContext) parent, indexes);
     }
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
index e62504d631f..6b9bf82d0e9 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
@@ -38,10 +38,11 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(3);
+    assertThat(diagnostics).hasSize(4);
     assertThat(diagnostics, true)
       .hasRange(1, 9, 1, 24)
       .hasRange(3, 17, 3, 32)
-      .hasRange(7, 12, 7, 27);
+      .hasRange(7, 12, 7, 27)
+      .hasRange(24, 33, 24, 48);
   }
 }

From c77f0dc24628ad9c4070debb221b2ea3237e6fba Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Wed, 6 May 2020 19:24:09 +0300
Subject: [PATCH 258/444] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=82=D0=B5=D1=81=D1=82-?=
 =?UTF-8?q?=D0=BA=D0=B5=D0=B9=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
index d33de2443ab..d056309c056 100644
--- a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
@@ -16,4 +16,12 @@
     Если Тест() ИЛИ Тест = Истина Тогда  // Нет срабатывания
         // код
     КонецЕсли;
+
+    Если Истина Тогда
+        Перем1 = БезопасныйРежим();  // Нет срабатывания
+        Перем1 = Метод(БезопасныйРежим());  // Нет срабатывания
+    КонецЕсли;
+
+    Если Условие И (Условие2 Или БезопасныйРежим()) Тогда // Есть срабатывание
+    КонецЕсли;
 КонецПроцедуры
\ No newline at end of file

From ab23128d9e1193ee1a8bf3cdebd356177be6ae06 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 7 May 2020 00:19:11 +0300
Subject: [PATCH 259/444] =?UTF-8?q?=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=89?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nsafeSafeModeMethodCallDiagnosticTest.java | 12 +++++++---
 .../UnsafeSafeModeMethodCallDiagnostic.bsl    | 24 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
index 6b9bf82d0e9..4b38e4ffdc5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
@@ -38,11 +38,17 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(4);
+    assertThat(diagnostics).hasSize(9);
     assertThat(diagnostics, true)
       .hasRange(1, 9, 1, 24)
       .hasRange(3, 17, 3, 32)
       .hasRange(7, 12, 7, 27)
-      .hasRange(24, 33, 24, 48);
+      .hasRange(11, 33, 11, 48)
+      .hasRange(14, 47, 14, 62)
+      .hasRange(16, 50, 16, 65)
+      .hasRange(18, 34, 18, 49)
+      .hasRange(20, 34, 20, 49)
+      .hasRange(23, 20, 23, 35)
+    ;
   }
-}
+}
\ No newline at end of file
diff --git a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
index d056309c056..ba7ba390f90 100644
--- a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
@@ -9,6 +9,21 @@
          // Логика выполнения в небезопасном режиме...
     КонецЕсли;
 
+    Если Условие И (Условие2 Или БезопасныйРежим()) Тогда // Есть срабатывание
+    КонецЕсли;
+
+    ФинальноеУсловие = Условие И (Условие2 Или БезопасныйРежим());  // Есть срабатывание
+
+    ФинальноеУсловие = Условие И (Условие2 Или Не БезопасныйРежим());  // Есть срабатывание
+
+    ФинальноеУсловие = Условие И (БезопасныйРежим() Или Условие2);  // Есть срабатывание
+
+    Если Условие И (Условие2 И Не БезопасныйРежим())) Тогда // Есть срабатывание
+    КонецЕсли;
+
+    Если Условие И (БезопасныйРежим() И Условие)) Тогда // Есть срабатывание
+    КонецЕсли;
+
     Если БезопасныйРежим() <> Ложь Тогда // Нет срабатывания
         // Логика выполнения в безопасном режиме...
     КонецЕсли;
@@ -19,9 +34,12 @@
 
     Если Истина Тогда
         Перем1 = БезопасныйРежим();  // Нет срабатывания
-        Перем1 = Метод(БезопасныйРежим());  // Нет срабатывания
-    КонецЕсли;
 
-    Если Условие И (Условие2 Или БезопасныйРежим()) Тогда // Есть срабатывание
+        Перем2 = Метод(БезопасныйРежим());  // Нет срабатывания
     КонецЕсли;
+
+    ФинальноеУсловие1 = Условие1 И (Условие12 Или БезопасныйРежим() = Истина);  // Нет срабатывания
+
+    ФинальноеУсловие2 = Условие2 И (Ложь <> БезопасныйРежим() Или Условие2);  // Нет срабатывания
+
 КонецПроцедуры
\ No newline at end of file

From 1c4631581fce444d9b28ba20b4250bc557b6759e Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 7 May 2020 00:36:27 +0300
Subject: [PATCH 260/444] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B5=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20-=20=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8F=D1=82=D1=81=D1=8F=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=95=D1=81=D0=BB=D0=B8\=D0=98=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D0=95=D1=81=D0=BB=D0=B8=20+=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D1=8B=D1=85=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsafeSafeModeMethodCallDiagnostic.java   | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index ac25c27a844..4732e7ab904 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -55,7 +55,8 @@ public class UnsafeSafeModeMethodCallDiagnostic extends AbstractFindMethodDiagno
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
   );
   private static final List<Integer> ROOT_LIST = Arrays.asList(
-    BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch, BSLParser.RULE_codeBlock);
+    BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch, BSLParser.RULE_expression,
+    BSLParser.RULE_codeBlock, BSLParser.RULE_assignment);
   private static final List<Integer> IF_BRANCHES = Arrays.asList(
     BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch);
 
@@ -79,23 +80,44 @@ protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     if (currentRootMember == null) {
       return false;
     }
-    BSLParserRuleContext rootExpressionNode = Trees.getRootParent(currentRootMember, BSLParser.RULE_expression);
-    if (rootExpressionNode == null) {
-      return false;
+    if (((BSLParserRuleContext)currentRootMember.getChild(0)).getRuleIndex() == BSLParser.RULE_unaryModifier){
+      return true;
     }
 
+    BSLParserRuleContext rootExpressionNode = (BSLParserRuleContext) currentRootMember.getParent();
+
     BSLParserRuleContext rootIfNode = Trees.getRootParent(rootExpressionNode, ROOT_LIST);
-    if (rootIfNode == null || !IF_BRANCHES.contains(rootIfNode.getRuleIndex())) {
+    if (rootIfNode == null || rootIfNode.getRuleIndex() == BSLParser.RULE_codeBlock) {
       return false;
     }
+    if (rootExpressionNode.getChildCount() == 1 && IF_BRANCHES.contains(rootIfNode.getRuleIndex())){
+      return true;
+    }
 
-    int indexOfCurrentMemberNode = rootExpressionNode.children.indexOf(currentRootMember);
-    if (indexOfCurrentMemberNode != rootExpressionNode.getChildCount() - 1) {
+    return haveNeighboorBooleanOperator(currentRootMember, rootExpressionNode);
+  }
 
-      var nextNode = rootExpressionNode.children.get(indexOfCurrentMemberNode + 1);
-      return !(Trees.nodeContains(nextNode, BSLParser.RULE_compareOperation));
+  private static boolean haveNeighboorBooleanOperator(BSLParserRuleContext currentRootMember,
+                                                      BSLParserRuleContext rootExpressionNode) {
+    boolean haveNeighboorBoolOperation = false;
+    int indexOfCurrentMemberNode = rootExpressionNode.children.indexOf(currentRootMember);
+    if (indexOfCurrentMemberNode > 0) {
+      var prev = (BSLParserRuleContext) rootExpressionNode.children.get(indexOfCurrentMemberNode - 1);
+      if (Trees.nodeContains(prev, BSLParser.RULE_compareOperation)){
+        return false;
+      }
+      haveNeighboorBoolOperation = Trees.nodeContains(prev, BSLParser.RULE_boolOperation);
     }
+    if (indexOfCurrentMemberNode < rootExpressionNode.getChildCount() - 1) {
 
-    return true;
+      var next = (BSLParserRuleContext) rootExpressionNode.children.get(indexOfCurrentMemberNode + 1);
+      if (Trees.nodeContains(next, BSLParser.RULE_compareOperation)){
+        return false;
+      }
+      if (!haveNeighboorBoolOperation){
+        haveNeighboorBoolOperation = Trees.nodeContains(next, BSLParser.RULE_boolOperation);
+      }
+    }
+    return haveNeighboorBoolOperation;
   }
 }

From 60763957e932467297e30e620f1845bacb916295 Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 7 May 2020 00:36:48 +0300
Subject: [PATCH 261/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D0=B0=D0=BC=D1=8B=D0=B9=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9=20=D0=BA=D0=B5=D0=B9=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java   | 3 ++-
 .../diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
index 4b38e4ffdc5..477bd664fdf 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnosticTest.java
@@ -38,7 +38,7 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(9);
+    assertThat(diagnostics).hasSize(10);
     assertThat(diagnostics, true)
       .hasRange(1, 9, 1, 24)
       .hasRange(3, 17, 3, 32)
@@ -49,6 +49,7 @@ void test() {
       .hasRange(18, 34, 18, 49)
       .hasRange(20, 34, 20, 49)
       .hasRange(23, 20, 23, 35)
+      .hasRange(26, 9, 26, 24)
     ;
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
index ba7ba390f90..6531bcbcd26 100644
--- a/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UnsafeSafeModeMethodCallDiagnostic.bsl
@@ -24,6 +24,10 @@
     Если Условие И (БезопасныйРежим() И Условие)) Тогда // Есть срабатывание
     КонецЕсли;
 
+    Если БезопасныйРежим() Тогда //Есть срабатывание
+        // Логика выполнения в безопасном режиме...
+    КонецЕсли;
+
     Если БезопасныйРежим() <> Ложь Тогда // Нет срабатывания
         // Логика выполнения в безопасном режиме...
     КонецЕсли;

From 4e9dc8d62b6ce6739a6904c1c0a15e47a93dfbb2 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Thu, 7 May 2020 07:31:16 +0300
Subject: [PATCH 262/444] Fix FN. Skip all StatementContext because they may be
 empty.

---
 .../bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index 162f8348fb2..de56b592b40 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -66,7 +66,8 @@ public void enterEveryRule(ParserRuleContext ctx) {
       regions.push((BSLParser.RegionStartContext) ctx);
     } else if (! (ctx instanceof BSLParser.PreprocessorContext
       || ctx instanceof BSLParser.RegionNameContext
-      || ctx instanceof BSLParser.RegionEndContext)
+      || ctx instanceof BSLParser.RegionEndContext
+      || ctx instanceof BSLParser.StatementContext)
       && currentUsageLevel < currentRegionLevel) {
       currentUsageLevel = currentRegionLevel;
     }

From f0bba75740ba5cebb7d09c0963c5e017a7492687 Mon Sep 17 00:00:00 2001
From: evgeniy <minimajack@gmail.com>
Date: Thu, 7 May 2020 07:45:06 +0300
Subject: [PATCH 263/444] Restore ranges. Fix build.

---
 .../bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index 30d40784a31..6e3076a45de 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -79,7 +79,7 @@ public void exitEveryRule(ParserRuleContext ctx) {
       BSLParser.RegionStartContext currentRegion = regions.pop();
       if (currentUsageLevel < currentRegionLevel) {
         diagnosticStorage.addDiagnostic(
-          Ranges.create(currentRegion),
+          Ranges.create(currentRegion.getParent(), ctx),
           info.getMessage(currentRegion.regionName().getText())
         );
       } else if (currentRegionLevel == currentUsageLevel) {

From 60d5118c4ad84ea05110bf8d9176870e85b70bfd Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 7 May 2020 19:29:20 +0300
Subject: [PATCH 264/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20javadoc=20=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B8=D0=BF=20=D0=BA=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=83=D0=BD=D0=B8=D0=B2=D0=B5=D1=80=D1=81=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_1c_syntax/bsl/languageserver/utils/Trees.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
index d4b9ca77584..ad05adb4c7a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Trees.java
@@ -223,6 +223,10 @@ public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc) {
 
   /**
    * Рекурсивно находит самого верхнего родителя текущей ноды нужного типа
+   *
+   * @param tnc       - нода, для которой ищем родителя
+   * @param ruleindex - BSLParser.RULE_*
+   * @return tnc - если родитель не найден, вернет null
    */
   public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, int ruleindex) {
     final var parent = tnc.getParent();
@@ -239,8 +243,12 @@ public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, int r
 
   /**
    * Рекурсивно находит самого верхнего родителя текущей ноды одного из нужных типов
+   *
+   * @param tnc       - нода, для которой ищем родителя
+   * @param indexes - Collection of BSLParser.RULE_*
+   * @return tnc - если родитель не найден, вернет null
    */
-  public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, List<Integer> indexes) {
+  public static BSLParserRuleContext getRootParent(BSLParserRuleContext tnc, Collection<Integer> indexes) {
     final var parent = tnc.getParent();
     if (parent == null) {
       return null;

From ac38cbede5480c9da9ca912231b389ce71fc8afd Mon Sep 17 00:00:00 2001
From: Artur Ayukhanov <aartbear@gmail.com>
Date: Thu, 7 May 2020 19:30:26 +0300
Subject: [PATCH 265/444] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D1=83=D1=8E=20Set=20=20+=20=D1=83=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnsafeSafeModeMethodCallDiagnostic.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 4732e7ab904..44d94f4119e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -32,8 +32,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 @DiagnosticMetadata(
@@ -54,10 +53,10 @@ public class UnsafeSafeModeMethodCallDiagnostic extends AbstractFindMethodDiagno
     "(БезопасныйРежим|SafeMode)",
     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
   );
-  private static final List<Integer> ROOT_LIST = Arrays.asList(
+  private static final Set<Integer> ROOT_LIST = Set.of(
     BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch, BSLParser.RULE_expression,
     BSLParser.RULE_codeBlock, BSLParser.RULE_assignment);
-  private static final List<Integer> IF_BRANCHES = Arrays.asList(
+  private static final Set<Integer> IF_BRANCHES = Set.of(
     BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch);
 
   public UnsafeSafeModeMethodCallDiagnostic(DiagnosticInfo info) {
@@ -76,11 +75,15 @@ protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       return false;
     }
 
-    BSLParserRuleContext currentRootMember = Trees.getRootParent(ctx, BSLParser.RULE_member);
+    BSLParser.MemberContext currentRootMember = (BSLParser.MemberContext)Trees.getRootParent(ctx, BSLParser.RULE_member);
     if (currentRootMember == null) {
       return false;
     }
-    if (((BSLParserRuleContext)currentRootMember.getChild(0)).getRuleIndex() == BSLParser.RULE_unaryModifier){
+    return nonValidExpression(currentRootMember);
+  }
+
+  private static boolean nonValidExpression(BSLParser.MemberContext currentRootMember) {
+    if (currentRootMember.unaryModifier() != null){
       return true;
     }
 

From e81bcebee4333e5d91ff49bc38f247098520ea25 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Thu, 7 May 2020 22:29:04 +0300
Subject: [PATCH 266/444] fix unreacheable preproc_endIf fp

---
 .../diagnostics/UnreachableCodeDiagnostic.java        |  2 +-
 .../diagnostics/UnreachableCodeDiagnosticTest.java    | 10 +++++++++-
 .../diagnostics/UnreachableCodeRegionDiagnostic.bsl   | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/diagnostics/UnreachableCodeRegionDiagnostic.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
index 4d245a1a155..9d2a6a185a1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
@@ -174,7 +174,7 @@ private void findAndAddDiagnostic(BSLParserRuleContext ctx) {
       .stream()
       .filter(node ->
         node.getStart().getType() != BSLLexer.SEMICOLON
-          && !Trees.nodeContains(node, BSLParser.RULE_regionStart, BSLParser.RULE_regionEnd))
+          && !Trees.nodeContains(node, BSLParser.RULE_regionStart, BSLParser.RULE_regionEnd, BSLParser.RULE_preproc_endif))
       .collect(Collectors.toList());
 
     // если в блоке кода есть еще стейты кроме текущего
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnosticTest.java
index 738ac8f5d3c..057ad74b464 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnosticTest.java
@@ -50,10 +50,18 @@ void test() {
       .hasRange(82, 16, 84, 25)
       .hasRange(93, 8, 16)
       .hasRange(102, 8, 17)
-      .hasRange(108, 16, 112, 26)
+      .hasRange(108, 16, 111, 29)
       .hasRange(138, 4, 16)
       .hasRange(161, 4, 13)
       .hasRange(166, 4, 168, 13)
       .hasRange(172, 0, 9);
   }
+
+  @Test
+  void testRegion() {
+    List<Diagnostic> diagnostics = getDiagnostics("UnreachableCodeRegionDiagnostic");
+
+    assertThat(diagnostics).hasSize(0);
+
+  }
 }
diff --git a/src/test/resources/diagnostics/UnreachableCodeRegionDiagnostic.bsl b/src/test/resources/diagnostics/UnreachableCodeRegionDiagnostic.bsl
new file mode 100644
index 00000000000..cc669c3aeea
--- /dev/null
+++ b/src/test/resources/diagnostics/UnreachableCodeRegionDiagnostic.bsl
@@ -0,0 +1,11 @@
+#Если Сервер Или ТолстыйКлиентОбычноеПриложение Или ВнешнееСоединение Тогда
+
+#Иначе
+
+#Область Инициализация
+
+	ВызватьИсключение НСтр("ru = 'Недопустимый вызов объекта на клиенте.'");
+
+#КонецОбласти
+
+#КонецЕсли

From 8717d86829960e22945500231f821946424eeee7 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 7 May 2020 11:44:07 +0300
Subject: [PATCH 267/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D0=BAb=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?mdoRef=20=D0=B2=20MethodSymbol=20=D0=B8=20ServerContext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/context/ServerContext.java | 66 ++++++++++++++++++-
 .../computer/MethodSymbolComputer.java        |  6 ++
 .../context/symbol/MethodSymbol.java          |  6 ++
 .../context/ServerContextTest.java            | 38 +++++++++++
 .../computer/MethodSymbolComputerTest.java    | 31 +++++++++
 .../Ext/ManagerModule.bsl"                    |  2 +-
 .../Ext/ObjectModule.bsl"                     |  2 +-
 .../Ext/Module.bsl"                           |  2 +-
 8 files changed, 149 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index d4b62c01410..3062297b29a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -21,7 +21,9 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context;
 
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.utils.Lazy;
 import org.eclipse.lsp4j.TextDocumentItem;
@@ -38,6 +40,8 @@ public class ServerContext {
   private final Lazy<Configuration> configurationMetadata = new Lazy<>(this::computeConfigurationMetadata);
   @CheckForNull
   private Path configurationRoot;
+  private final Map<URI, String> mdoRefs = Collections.synchronizedMap(new HashMap<>());
+  private final Map<String, Map<ModuleType, DocumentContext>> documentsByMDORef = Collections.synchronizedMap(new HashMap<>());
 
   public ServerContext() {
     this(null);
@@ -51,16 +55,37 @@ public Map<URI, DocumentContext> getDocuments() {
     return Collections.unmodifiableMap(documents);
   }
 
+  public Map<URI, String> getMdoRefs() {
+    return Collections.unmodifiableMap(mdoRefs);
+  }
+
+  public Map<String, Map<ModuleType, DocumentContext>> getDocumentsByMdoRef() {
+    return Collections.unmodifiableMap(documentsByMDORef);
+  }
+
   @CheckForNull
   public DocumentContext getDocument(String uri) {
     return getDocument(URI.create(uri));
   }
 
+  public DocumentContext getDocument(String mdoRef, ModuleType moduleType) {
+    var documentsGroup = documentsByMDORef.get(mdoRef);
+    if (documentsGroup != null) {
+      return documentsGroup.get(moduleType);
+    }
+    return null;
+  }
+
   @CheckForNull
   public DocumentContext getDocument(URI uri) {
     return documents.get(Absolute.uri(uri));
   }
 
+  @CheckForNull
+  public Map<ModuleType, DocumentContext> getDocumentsByMdoRef(String mdoRef) {
+    return documentsByMDORef.get(mdoRef);
+  }
+
   public DocumentContext addDocument(URI uri, String content) {
     URI absoluteURI = Absolute.uri(uri);
 
@@ -68,6 +93,7 @@ public DocumentContext addDocument(URI uri, String content) {
     if (documentContext == null) {
       documentContext = new DocumentContext(absoluteURI, content, this);
       documents.put(absoluteURI, documentContext);
+      addMdoRefByUri(absoluteURI, documentContext);
     } else {
       documentContext.rebuild(content);
     }
@@ -80,11 +106,15 @@ public DocumentContext addDocument(TextDocumentItem textDocumentItem) {
   }
 
   public void removeDocument(URI uri) {
-    documents.remove(Absolute.uri(uri));
+    URI absoluteURI = Absolute.uri(uri);
+    removeDocumentMdoRefByUri(absoluteURI);
+    documents.remove(absoluteURI);
   }
 
   public void clear() {
     documents.clear();
+    documentsByMDORef.clear();
+    mdoRefs.clear();
     configurationMetadata.clear();
   }
 
@@ -103,4 +133,38 @@ private Configuration computeConfigurationMetadata() {
 
     return Configuration.create(configurationRoot);
   }
+
+  private void addMdoRefByUri(URI uri, DocumentContext documentContext) {
+    addMdoRefByUri(getConfiguration().getModulesByURI(), uri, documentContext);
+  }
+
+  private void addMdoRefByUri(Map<URI, MDObjectBase> modulesByUri, URI uri, DocumentContext documentContext) {
+    var mdoByUri = modulesByUri.get(uri);
+    if (mdoByUri != null) {
+      var mdoRef = mdoByUri.getMdoRef();
+      mdoRefs.put(uri, mdoRef);
+      var documentsGroup = documentsByMDORef.get(mdoRef);
+      if (documentsGroup == null) {
+        Map<ModuleType, DocumentContext> newDocumentsGroup = new HashMap<>();
+        newDocumentsGroup.put(documentContext.getModuleType(), documentContext);
+        documentsByMDORef.put(mdoRef, newDocumentsGroup);
+      } else {
+        documentsGroup.put(documentContext.getModuleType(), documentContext);
+      }
+    }
+  }
+
+  private void removeDocumentMdoRefByUri(URI uri) {
+    var mdoRef = mdoRefs.get(uri);
+    if (mdoRef != null) {
+      var documentsGroup = documentsByMDORef.get(mdoRef);
+      if (documentsGroup != null) {
+        documentsGroup.remove(documents.get(uri).getModuleType());
+        if (documentsGroup.isEmpty()) {
+          documentsByMDORef.remove(mdoRef);
+        }
+      }
+      mdoRefs.remove(uri);
+    }
+  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index 559aba92f1f..9ba5578f13d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserBaseVisitor;
+import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
@@ -130,6 +131,10 @@ private MethodSymbol createMethodSymbol(
       .map(MethodDescription::isDeprecated)
       .orElse(false);
 
+    String mdoRef = documentContext.getMdObject()
+      .map(MDObjectBase::getMdoRef)
+      .orElse(null);
+
     return MethodSymbol.builder()
       .name(subName.getText())
       .range(Ranges.create(startNode, stopNode))
@@ -138,6 +143,7 @@ private MethodSymbol createMethodSymbol(
       .export(export)
       .description(description)
       .deprecated(deprecated)
+      .mdoRef(mdoRef)
       .parameters(createParameters(paramList))
       .build();
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
index 46b94f8d48e..0f4e5b944c9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodSymbol.java
@@ -59,6 +59,12 @@ public class MethodSymbol implements Symbol {
 
   boolean deprecated;
 
+  /**
+   * Ссылка на объект метаданных, в модуле которого находится метод
+   * Формат ссылки: Document.Заказ, CommonModule.ОбщегоНазначения
+   */
+  String mdoRef;
+
   @Builder.Default
   List<ParameterDefinition> parameters = new ArrayList<>();
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
index 515eb9aa948..eed6bfefe7f 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
@@ -26,9 +26,12 @@
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.mdclasses.metadata.additional.ScriptVariant;
 import com.github._1c_syntax.utils.Absolute;
+import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -38,6 +41,8 @@ public class ServerContextTest {
 
   private static final String PATH_TO_METADATA = "src/test/resources/metadata";
   private static final String PATH_TO_MODULE_FILE = "CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+  private static final String PATH_TO_CATALOG_FILE = "Catalogs/Справочник1/Ext/ManagerModule.bsl";
+  private static final String PATH_TO_CATALOG_MODULE_FILE = "Catalogs/Справочник1/Ext/ObjectModule.bsl";
 
   @Test
   void testConfigurationMetadata() {
@@ -62,6 +67,34 @@ void testConfigurationMetadata() {
 
   }
 
+  @Test
+  void testMdoRefs() throws IOException {
+
+    var path = Absolute.path(PATH_TO_METADATA);
+    var serverContext = new ServerContext(path);
+    var mdoRefCommonModule = "CommonModule.ПервыйОбщийМодуль";
+
+    DocumentContext documentContext = addDocumentContext(serverContext, PATH_TO_MODULE_FILE);
+    assertThat(serverContext.getMdoRefs()).hasSize(1);
+    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(1);
+    assertThat(serverContext.getDocument(mdoRefCommonModule, documentContext.getModuleType()))
+      .isEqualTo(documentContext);
+    assertThat(serverContext.getDocumentsByMdoRef(mdoRefCommonModule))
+      .hasSize(1)
+      .containsKey(documentContext.getModuleType())
+      .containsValue(documentContext);
+
+    addDocumentContext(serverContext, PATH_TO_CATALOG_MODULE_FILE);
+    addDocumentContext(serverContext, PATH_TO_CATALOG_FILE);
+
+    assertThat(serverContext.getMdoRefs()).hasSize(3);
+    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(2);
+
+    assertThat(serverContext.getDocumentsByMdoRef("Catalog.Справочник1"))
+      .hasSize(2)
+      .containsKeys(ModuleType.ManagerModule, ModuleType.ObjectModule);
+  }
+
   @Test
   void testErrorConfigurationMetadata() {
     Path path = Absolute.path(Paths.get(PATH_TO_METADATA, "test"));
@@ -74,4 +107,9 @@ void testErrorConfigurationMetadata() {
     assertThat(configurationMetadata.getModulesByType()).hasSize(0);
   }
 
+  private DocumentContext addDocumentContext(ServerContext serverContext, String path) throws IOException {
+    var file = new File(PATH_TO_METADATA, path);
+    var uri = Absolute.uri(file);
+    return serverContext.addDocument(uri, FileUtils.readFileToString(file, StandardCharsets.UTF_8));
+  }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index c8cf325fdb4..a87d3889c4d 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -22,18 +22,29 @@
 package com.github._1c_syntax.bsl.languageserver.context.computer;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.ParameterDefinition;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.utils.Absolute;
+import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MethodSymbolComputerTest {
 
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+  private static final String PATH_TO_CATALOG_FILE = "Catalogs/Справочник1/Ext/ManagerModule.bsl";
+  private static final String PATH_TO_CATALOG_MODULE_FILE = "Catalogs/Справочник1/Ext/ObjectModule.bsl";
+
   @Test
   void testMethodSymbolComputer() {
 
@@ -99,6 +110,16 @@ void testDeprecated() {
     assertThat(methodSymbol.getDescription().orElseThrow().getDeprecatedInfo()).isNotEmpty();
   }
 
+  @Test
+  void testMdoRef() throws IOException {
+
+    var path = Absolute.path(PATH_TO_METADATA);
+    var serverContext = new ServerContext(path);
+    checkModule(serverContext, PATH_TO_MODULE_FILE, "CommonModule.ПервыйОбщийМодуль");
+    checkModule(serverContext, PATH_TO_CATALOG_FILE, "Catalog.Справочник1");
+    checkModule(serverContext, PATH_TO_CATALOG_MODULE_FILE, "Catalog.Справочник1");
+  }
+
   @Test
   void testParseError() {
 
@@ -109,4 +130,14 @@ void testParseError() {
     assertThat(methods.get(0).getSubNameRange()).isEqualTo(Ranges.create(0, 10, 0, 19));
 
   }
+
+  private void checkModule(ServerContext serverContext, String path, String mdoRef) throws IOException {
+    var file = new File(PATH_TO_METADATA, path);
+    var uri = Absolute.uri(file);
+    var documentContext = serverContext.addDocument(uri, FileUtils.readFileToString(file, StandardCharsets.UTF_8));
+    List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
+    assertThat(methods.size()).isEqualTo(1);
+    assertThat(methods.get(0).getName()).isEqualTo("Тест");
+    assertThat(methods.get(0).getMdoRef()).isEqualTo(mdoRef);
+  }
 }
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ManagerModule.bsl" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ManagerModule.bsl"
index 5336dff9ef1..9e86853259e 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ManagerModule.bsl"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ManagerModule.bsl"
@@ -14,7 +14,7 @@
 #КонецОбласти
 
 #Область СлужебныеПроцедурыИФункции
-// Код процедур и функций
+Процедура Тест() КонецПроцедуры
 #КонецОбласти
 
 
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ObjectModule.bsl" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ObjectModule.bsl"
index 5336dff9ef1..ccb85c7239d 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ObjectModule.bsl"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Ext/ObjectModule.bsl"
@@ -14,7 +14,7 @@
 #КонецОбласти
 
 #Область СлужебныеПроцедурыИФункции
-// Код процедур и функций
+Function Тест() EndFunction
 #КонецОбласти
 
 
diff --git "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl" "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
index feb46be66dd..b91677cafa7 100644
--- "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
+++ "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
@@ -52,7 +52,7 @@
 #КонецОбласти
 
 #Область СлужебныеПроцедурыИФункции
-// Код процедур и функций
+Функция Тест() КонецФункции
 #КонецОбласти
 
 #Region Initialize

From b4160af90a3a8b599ed83eab062650d0f0c51051 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 7 May 2020 12:26:18 +0300
Subject: [PATCH 268/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/context/ServerContext.java        | 3 ++-
 .../bsl/languageserver/context/ServerContextTest.java    | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index 3062297b29a..b0a7edd3a3d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -41,7 +41,8 @@ public class ServerContext {
   @CheckForNull
   private Path configurationRoot;
   private final Map<URI, String> mdoRefs = Collections.synchronizedMap(new HashMap<>());
-  private final Map<String, Map<ModuleType, DocumentContext>> documentsByMDORef = Collections.synchronizedMap(new HashMap<>());
+  private final Map<String, Map<ModuleType, DocumentContext>> documentsByMDORef
+    = Collections.synchronizedMap(new HashMap<>());
 
   public ServerContext() {
     this(null);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
index eed6bfefe7f..bc41c77eaf5 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
@@ -87,12 +87,21 @@ void testMdoRefs() throws IOException {
     addDocumentContext(serverContext, PATH_TO_CATALOG_MODULE_FILE);
     addDocumentContext(serverContext, PATH_TO_CATALOG_FILE);
 
+    // для проверки на дубль
+    addDocumentContext(serverContext, PATH_TO_CATALOG_FILE);
+
     assertThat(serverContext.getMdoRefs()).hasSize(3);
     assertThat(serverContext.getDocumentsByMdoRef()).hasSize(2);
 
     assertThat(serverContext.getDocumentsByMdoRef("Catalog.Справочник1"))
       .hasSize(2)
       .containsKeys(ModuleType.ManagerModule, ModuleType.ObjectModule);
+
+    serverContext.removeDocument(Absolute.uri(new File(PATH_TO_METADATA, PATH_TO_MODULE_FILE)));
+    assertThat(serverContext.getMdoRefs()).hasSize(2);
+    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(1);
+
+    assertThat(serverContext.getDocument(mdoRefCommonModule, ModuleType.CommonModule)).isNull();
   }
 
   @Test

From dd2aa47abb4b8a407ad63d787142827c6eba2221 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 7 May 2020 23:13:54 +0300
Subject: [PATCH 269/444] to EnumMap

---
 .../_1c_syntax/bsl/languageserver/context/ServerContext.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index b0a7edd3a3d..7d46a721f45 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -32,6 +32,7 @@
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -146,7 +147,7 @@ private void addMdoRefByUri(Map<URI, MDObjectBase> modulesByUri, URI uri, Docume
       mdoRefs.put(uri, mdoRef);
       var documentsGroup = documentsByMDORef.get(mdoRef);
       if (documentsGroup == null) {
-        Map<ModuleType, DocumentContext> newDocumentsGroup = new HashMap<>();
+        Map<ModuleType, DocumentContext> newDocumentsGroup = new EnumMap<>(ModuleType.class);
         newDocumentsGroup.put(documentContext.getModuleType(), documentContext);
         documentsByMDORef.put(mdoRef, newDocumentsGroup);
       } else {

From ffefe4057b42a9c19f68bf44871b80c92c19e0ea Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 7 May 2020 23:16:20 +0300
Subject: [PATCH 270/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20documentLink?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLanguageServer.java |  2 +
 .../BSLTextDocumentService.java               | 17 +++-
 .../providers/DocumentLinkProvider.java       | 56 +++++++++++
 .../providers/DocumentLinkProviderTest.java   | 97 +++++++++++++++++++
 .../.bsl-language-server-only-en-param.json   |  3 +
 .../providers/documentLinkProvider.bsl        |  5 +
 6 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
 create mode 100644 src/test/resources/.bsl-language-server-only-en-param.json
 create mode 100644 src/test/resources/providers/documentLinkProvider.bsl

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
index 24e77222dc7..06980c45f30 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
@@ -25,6 +25,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.lsp4j.CodeLensOptions;
+import org.eclipse.lsp4j.DocumentLinkOptions;
 import org.eclipse.lsp4j.InitializeParams;
 import org.eclipse.lsp4j.InitializeResult;
 import org.eclipse.lsp4j.ServerCapabilities;
@@ -76,6 +77,7 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
     capabilities.setDocumentSymbolProvider(Boolean.TRUE);
     capabilities.setCodeActionProvider(Boolean.TRUE);
     capabilities.setCodeLensProvider(new CodeLensOptions());
+    capabilities.setDocumentLinkProvider(new DocumentLinkOptions());
 
     InitializeResult result = new InitializeResult(capabilities);
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
index 89d0dea4e30..a794a9ee6e7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java
@@ -22,14 +22,15 @@
 package com.github._1c_syntax.bsl.languageserver;
 
 import com.github._1c_syntax.bsl.languageserver.codeactions.QuickFixSupplier;
-import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.ComputeTrigger;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.ComputeTrigger;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier;
 import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.CodeLensProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider;
+import com.github._1c_syntax.bsl.languageserver.providers.DocumentLinkProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.DocumentSymbolProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.FoldingRangeProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.FormatProvider;
@@ -50,6 +51,8 @@
 import org.eclipse.lsp4j.DocumentFormattingParams;
 import org.eclipse.lsp4j.DocumentHighlight;
 import org.eclipse.lsp4j.DocumentHighlightParams;
+import org.eclipse.lsp4j.DocumentLink;
+import org.eclipse.lsp4j.DocumentLinkParams;
 import org.eclipse.lsp4j.DocumentOnTypeFormattingParams;
 import org.eclipse.lsp4j.DocumentRangeFormattingParams;
 import org.eclipse.lsp4j.DocumentSymbol;
@@ -85,6 +88,7 @@ public class BSLTextDocumentService implements TextDocumentService, LanguageClie
   private final DiagnosticProvider diagnosticProvider;
   private final CodeActionProvider codeActionProvider;
   private final CodeLensProvider codeLensProvider;
+  private final DocumentLinkProvider documentLinkProvider;
 
   @CheckForNull
   private LanguageClient client;
@@ -99,6 +103,7 @@ public BSLTextDocumentService(LanguageServerConfiguration configuration, ServerC
     diagnosticProvider = new DiagnosticProvider(diagnosticSupplier);
     codeActionProvider = new CodeActionProvider(this.diagnosticProvider, quickFixSupplier);
     codeLensProvider = new CodeLensProvider(this.configuration);
+    documentLinkProvider = new DocumentLinkProvider(this.configuration, this.diagnosticProvider);
   }
 
   @Override
@@ -281,6 +286,16 @@ public void connect(LanguageClient client) {
     this.client = client;
   }
 
+  @Override
+  public CompletableFuture<List<DocumentLink>> documentLink(DocumentLinkParams params) {
+    DocumentContext documentContext = context.getDocument(params.getTextDocument().getUri());
+    if (documentContext == null) {
+      return CompletableFuture.completedFuture(null);
+    }
+
+    return CompletableFuture.supplyAsync(() -> documentLinkProvider.getDocumentLinks(documentContext));
+  }
+
   public void reset() {
     diagnosticProvider.clearAllComputedDiagnostics();
     context.clear();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
new file mode 100644
index 00000000000..4db41150eb1
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
@@ -0,0 +1,56 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.providers;
+
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
+import org.eclipse.lsp4j.DocumentLink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Класс-провайдер для реализации формирования ссылки на страницу с информацией по диагностике
+ */
+public class DocumentLinkProvider {
+  private final DiagnosticProvider diagnosticProvider;
+  private static final String SITE_DIAGNOSTICS_URL_RU = "https://1c-syntax.github.io/bsl-language-server/diagnostics/";
+  private static final String SITE_DIAGNOSTICS_URL_EN = "https://1c-syntax.github.io/bsl-language-server/en/diagnostics/";
+  private final LanguageServerConfiguration configuration;
+
+  public DocumentLinkProvider(LanguageServerConfiguration configuration, DiagnosticProvider diagnosticProvider) {
+    this.diagnosticProvider = diagnosticProvider;
+    this.configuration = configuration;
+  }
+
+  public List<DocumentLink> getDocumentLinks(DocumentContext documentContext) {
+    List<DocumentLink> documentLinks = new ArrayList<>();
+    var siteDiagnosticsUrl = configuration.getLanguage().equals(Language.EN)
+      ? SITE_DIAGNOSTICS_URL_EN : SITE_DIAGNOSTICS_URL_RU;
+    diagnosticProvider.getComputedDiagnostics(documentContext)
+      .forEach(diagnostic -> documentLinks.add(new DocumentLink(diagnostic.getRange(),
+        siteDiagnosticsUrl + DiagnosticCode.getStringValue(diagnostic.getCode()))));
+    return documentLinks;
+  }
+}
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
new file mode 100644
index 00000000000..4e3e792668d
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
@@ -0,0 +1,97 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.providers;
+
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier;
+import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DocumentLinkProviderTest {
+
+  private static final String SITE_URL = "https://1c-syntax.github.io/bsl-language-server/";
+  private static final String SITE_EN_URL = "https://1c-syntax.github.io/bsl-language-server/en/";
+  private static final String DIAGNOSTIC_CODE = "CanonicalSpellingKeywords";
+
+  @Test
+  void testGetDocumentLinks() {
+
+    // given
+    var configuration = LanguageServerConfiguration.create();
+    var documentContext = getDocumentContext();
+    var documentLinkProvider = getDocumentLinkProvider(configuration, documentContext);
+
+    // when
+    var documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .isNotEmpty()
+      .hasSize(7)
+      .allMatch(documentLink -> documentLink.getTarget()
+        .startsWith(SITE_URL))
+      .filteredOn(documentLink -> !documentLink.getTarget().endsWith(DIAGNOSTIC_CODE))
+      .hasSize(3);
+  }
+
+  @Test
+  void testGetDocumentLinksEn() {
+
+    // given
+    var configurationFile = new File("./src/test/resources/.bsl-language-server-only-en-param.json");
+    var configuration = LanguageServerConfiguration.create(configurationFile);
+    var documentContext = getDocumentContext();
+    var documentLinkProvider = getDocumentLinkProvider(configuration, documentContext);
+
+    // when
+    var documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .isNotEmpty()
+      .hasSize(7)
+      .allMatch(documentLink -> documentLink.getTarget()
+        .startsWith(SITE_EN_URL))
+      .filteredOn(documentLink -> !documentLink.getTarget().endsWith(DIAGNOSTIC_CODE))
+      .hasSize(3);
+  }
+
+  @NotNull
+  private DocumentLinkProvider getDocumentLinkProvider(LanguageServerConfiguration configuration, DocumentContext documentContext) {
+    var diagnosticSupplier = new DiagnosticSupplier(configuration);
+    var diagnosticProvider = new DiagnosticProvider(diagnosticSupplier);
+    diagnosticProvider.computeDiagnostics(documentContext);
+    return new DocumentLinkProvider(configuration, diagnosticProvider);
+  }
+
+  @NotNull
+  private DocumentContext getDocumentContext() {
+    var filePath = "./src/test/resources/providers/documentLinkProvider.bsl";
+    return TestUtils.getDocumentContextFromFile(filePath);
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/.bsl-language-server-only-en-param.json b/src/test/resources/.bsl-language-server-only-en-param.json
new file mode 100644
index 00000000000..a6042a4e442
--- /dev/null
+++ b/src/test/resources/.bsl-language-server-only-en-param.json
@@ -0,0 +1,3 @@
+{
+  "language": "en"
+}
diff --git a/src/test/resources/providers/documentLinkProvider.bsl b/src/test/resources/providers/documentLinkProvider.bsl
new file mode 100644
index 00000000000..dc5ec2acd07
--- /dev/null
+++ b/src/test/resources/providers/documentLinkProvider.bsl
@@ -0,0 +1,5 @@
+Процедура ИмяПроцедуры()
+    для каждого А из т цикл
+        Сообщить(А)
+    конецЦикла;
+КонецПроцедуры
\ No newline at end of file

From 0c6573c0ef654c0aedfe0712e09b160795c25f85 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 8 May 2020 08:37:25 +0300
Subject: [PATCH 271/444] fix SQ

---
 .../bsl/languageserver/providers/DocumentLinkProvider.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
index 4db41150eb1..0e4faeb3aa0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
@@ -35,8 +35,8 @@
  */
 public class DocumentLinkProvider {
   private final DiagnosticProvider diagnosticProvider;
-  private static final String SITE_DIAGNOSTICS_URL_RU = "https://1c-syntax.github.io/bsl-language-server/diagnostics/";
-  private static final String SITE_DIAGNOSTICS_URL_EN = "https://1c-syntax.github.io/bsl-language-server/en/diagnostics/";
+  private static final String SITE_URL_RU = "https://1c-syntax.github.io/bsl-language-server/diagnostics/";
+  private static final String SITE_URL_EN = "https://1c-syntax.github.io/bsl-language-server/en/diagnostics/";
   private final LanguageServerConfiguration configuration;
 
   public DocumentLinkProvider(LanguageServerConfiguration configuration, DiagnosticProvider diagnosticProvider) {
@@ -46,8 +46,7 @@ public DocumentLinkProvider(LanguageServerConfiguration configuration, Diagnosti
 
   public List<DocumentLink> getDocumentLinks(DocumentContext documentContext) {
     List<DocumentLink> documentLinks = new ArrayList<>();
-    var siteDiagnosticsUrl = configuration.getLanguage().equals(Language.EN)
-      ? SITE_DIAGNOSTICS_URL_EN : SITE_DIAGNOSTICS_URL_RU;
+    var siteDiagnosticsUrl = configuration.getLanguage() == Language.EN ? SITE_URL_EN : SITE_URL_RU;
     diagnosticProvider.getComputedDiagnostics(documentContext)
       .forEach(diagnostic -> documentLinks.add(new DocumentLink(diagnostic.getRange(),
         siteDiagnosticsUrl + DiagnosticCode.getStringValue(diagnostic.getCode()))));

From 035e6d175ed0803e3e7e69952c19a26b208a9d48 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 8 May 2020 09:13:19 +0300
Subject: [PATCH 272/444] fix CR

---
 .../languageserver/context/ServerContext.java | 22 +++++--------------
 .../computer/MethodSymbolComputer.java        |  2 +-
 .../context/ServerContextTest.java            | 13 ++++-------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index 7d46a721f45..446587c65df 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.context;
 
-import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.utils.Absolute;
@@ -35,6 +34,7 @@
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public class ServerContext {
   private final Map<URI, DocumentContext> documents = Collections.synchronizedMap(new HashMap<>());
@@ -57,25 +57,17 @@ public Map<URI, DocumentContext> getDocuments() {
     return Collections.unmodifiableMap(documents);
   }
 
-  public Map<URI, String> getMdoRefs() {
-    return Collections.unmodifiableMap(mdoRefs);
-  }
-
-  public Map<String, Map<ModuleType, DocumentContext>> getDocumentsByMdoRef() {
-    return Collections.unmodifiableMap(documentsByMDORef);
-  }
-
   @CheckForNull
   public DocumentContext getDocument(String uri) {
     return getDocument(URI.create(uri));
   }
 
-  public DocumentContext getDocument(String mdoRef, ModuleType moduleType) {
+  public Optional<DocumentContext> getDocument(String mdoRef, ModuleType moduleType) {
     var documentsGroup = documentsByMDORef.get(mdoRef);
     if (documentsGroup != null) {
-      return documentsGroup.get(moduleType);
+      return Optional.ofNullable(documentsGroup.get(moduleType));
     }
-    return null;
+    return Optional.empty();
   }
 
   @CheckForNull
@@ -137,11 +129,9 @@ private Configuration computeConfigurationMetadata() {
   }
 
   private void addMdoRefByUri(URI uri, DocumentContext documentContext) {
-    addMdoRefByUri(getConfiguration().getModulesByURI(), uri, documentContext);
-  }
-
-  private void addMdoRefByUri(Map<URI, MDObjectBase> modulesByUri, URI uri, DocumentContext documentContext) {
+    var modulesByUri = getConfiguration().getModulesByURI();
     var mdoByUri = modulesByUri.get(uri);
+
     if (mdoByUri != null) {
       var mdoRef = mdoByUri.getMdoRef();
       mdoRefs.put(uri, mdoRef);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
index 9ba5578f13d..376c263598d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -133,7 +133,7 @@ private MethodSymbol createMethodSymbol(
 
     String mdoRef = documentContext.getMdObject()
       .map(MDObjectBase::getMdoRef)
-      .orElse(null);
+      .orElse("");
 
     return MethodSymbol.builder()
       .name(subName.getText())
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
index bc41c77eaf5..868aae9b8c7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
@@ -75,9 +75,9 @@ void testMdoRefs() throws IOException {
     var mdoRefCommonModule = "CommonModule.ПервыйОбщийМодуль";
 
     DocumentContext documentContext = addDocumentContext(serverContext, PATH_TO_MODULE_FILE);
-    assertThat(serverContext.getMdoRefs()).hasSize(1);
-    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(1);
     assertThat(serverContext.getDocument(mdoRefCommonModule, documentContext.getModuleType()))
+      .isPresent()
+      .get()
       .isEqualTo(documentContext);
     assertThat(serverContext.getDocumentsByMdoRef(mdoRefCommonModule))
       .hasSize(1)
@@ -90,18 +90,13 @@ void testMdoRefs() throws IOException {
     // для проверки на дубль
     addDocumentContext(serverContext, PATH_TO_CATALOG_FILE);
 
-    assertThat(serverContext.getMdoRefs()).hasSize(3);
-    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(2);
-
     assertThat(serverContext.getDocumentsByMdoRef("Catalog.Справочник1"))
       .hasSize(2)
       .containsKeys(ModuleType.ManagerModule, ModuleType.ObjectModule);
 
     serverContext.removeDocument(Absolute.uri(new File(PATH_TO_METADATA, PATH_TO_MODULE_FILE)));
-    assertThat(serverContext.getMdoRefs()).hasSize(2);
-    assertThat(serverContext.getDocumentsByMdoRef()).hasSize(1);
-
-    assertThat(serverContext.getDocument(mdoRefCommonModule, ModuleType.CommonModule)).isNull();
+    assertThat(serverContext.getDocument(mdoRefCommonModule, ModuleType.CommonModule))
+      .isNotPresent();
   }
 
   @Test

From 02bed0b18996ea465494d07e847f8424d4a390a4 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 8 May 2020 11:42:00 +0300
Subject: [PATCH 273/444] CashedPublicDiagnostic

---
 docs/diagnostics/CachedPublic.md              |  44 ++++++
 docs/en/diagnostics/CachedPublic.md           |  36 +++++
 .../diagnostics/CachedPublicDiagnostic.java   |  89 +++++++++++
 .../CachedPublicDiagnostic_en.properties      |   2 +
 .../CachedPublicDiagnostic_ru.properties      |   2 +
 .../CachedPublicDiagnosticTest.java           | 138 ++++++++++++++++++
 .../diagnostics/CachedPublicDiagnostic.bsl    |  23 +++
 7 files changed, 334 insertions(+)
 create mode 100644 docs/diagnostics/CachedPublic.md
 create mode 100644 docs/en/diagnostics/CachedPublic.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CachedPublicDiagnostic.bsl

diff --git a/docs/diagnostics/CachedPublic.md b/docs/diagnostics/CachedPublic.md
new file mode 100644
index 00000000000..4d95b8fcb74
--- /dev/null
+++ b/docs/diagnostics/CachedPublic.md
@@ -0,0 +1,44 @@
+# Кеширование программного интерфейса (CachedPublic)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`design` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+
+Не следует создавать программный интерфейс в модулях с повторным использованием возвращаемых значений.
+
+3.6. Другой пример скрытия деталей реализации библиотеки от потребителя. 
+Допустим: в первой версии библиотеки потребителям предоставлялась экспортная функция общего модуля с повторным использованием 
+возвращаемых значений; Но в следующей версии библиотеки это проектное решение пересмотрено в пользу 
+«обычного» общего модуля, куда эта функция была перенесена (аналогично, если в обратную сторону). В данном примере, 
+для того чтобы избавить потребителя библиотеки от дополнительных усилий по замене вызовов «старой» функции на новую,
+рекомендуется сразу размещать экспортную функцию в «обычном» модуле, в его разделе «программный интерфейс». Тогда эта
+функция, в зависимости от текущего проектного решения, может вызывать служебную функцию из модуля с повторным 
+использованием возвращаемых значений или из любого другого модуля, или непосредственно сама содержать реализацию. 
+Однако для потребителя ее местоположение уже не будет меняться в следующих версиях библиотеки.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+
+* Источник: [Стандарт: Обеспечение совместимости библиотек](https://its.1c.ru/db/v8std#content:644:hdoc:3.6)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CachedPublic-off
+// BSLLS:CachedPublic-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CachedPublic": false
+```
diff --git a/docs/en/diagnostics/CachedPublic.md b/docs/en/diagnostics/CachedPublic.md
new file mode 100644
index 00000000000..5462c2d49a6
--- /dev/null
+++ b/docs/en/diagnostics/CachedPublic.md
@@ -0,0 +1,36 @@
+# Cached public methods (CachedPublic)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`design` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CachedPublic-off
+// BSLLS:CachedPublic-on
+```
+
+### Parameter for config
+
+```json
+"CachedPublic": false
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
new file mode 100644
index 00000000000..a93af83fa33
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
@@ -0,0 +1,89 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.DiagnosticScope;
+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.utils.Keywords;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
+
+import java.util.regex.Pattern;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.DESIGN
+  }
+
+)
+public class CachedPublicDiagnostic extends AbstractDiagnostic {
+
+  private static final Pattern PUBLIC = CaseInsensitivePattern.compile(
+    String.format("^(%s|%s)$", Keywords.PUBLIC_REGION_RU, Keywords.PUBLIC_REGION_EN));
+
+  public CachedPublicDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  protected void check(DocumentContext documentContext) {
+
+    if (!isCashed(documentContext)) {
+      return;
+    }
+
+    documentContext.getSymbolTree().getModuleLevelRegions()
+      .stream()
+      .filter(regionSymbol -> PUBLIC.matcher(regionSymbol.getName()).find())
+      .forEach(regionSymbol -> diagnosticStorage.addDiagnostic(regionSymbol.getRegionNameRange()));
+  }
+
+  private boolean isCashed(DocumentContext documentContext) {
+    return documentContext.getMdObject()
+      .filter(CommonModule.class::isInstance)
+      .map(CommonModule.class::cast)
+      .map(CommonModule::getReturnValuesReuse)
+      .filter(this::isReuseValue)
+      .isPresent();
+  }
+
+  private Boolean isReuseValue(ReturnValueReuse value) {
+    return value == ReturnValueReuse.DURING_REQUEST
+      || value == ReturnValueReuse.DURING_SESSION;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_en.properties
new file mode 100644
index 00000000000..f35d1858669
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Move methods to private region
+diagnosticName=Cached public methods
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_ru.properties
new file mode 100644
index 00000000000..1d265cf1bd1
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Переместите методы в Служебный Программный интерфейс
+diagnosticName=Кеширование программного интерфейса
\ No newline at end of file
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
new file mode 100644
index 00000000000..d6864b85c3f
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
@@ -0,0 +1,138 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ReturnValueReuse;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CachedPublicDiagnosticTest extends AbstractDiagnosticTest<CachedPublicDiagnostic> {
+  CachedPublicDiagnosticTest() {
+    super(CachedPublicDiagnostic.class);
+  }
+
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+  private static final String PATH_TO_MODULE_CONTENT = "src/test/resources/diagnostics/CachedPublicDiagnostic.bsl";
+
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DURING_REQUEST);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(0, 9, 29)
+      .hasRange(16, 9, 15);
+
+  }
+  @Test
+  void testSession() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DURING_SESSION);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(0, 9, 29)
+      .hasRange(16, 9, 15);
+
+  }
+
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getReturnValuesReuse()).thenReturn(ReturnValueReuse.DONT_USE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path moduleFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+    Path testFile = Paths.get(PATH_TO_MODULE_CONTENT).toAbsolutePath();
+
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(moduleFile.toUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/CachedPublicDiagnostic.bsl b/src/test/resources/diagnostics/CachedPublicDiagnostic.bsl
new file mode 100644
index 00000000000..73c386a1bba
--- /dev/null
+++ b/src/test/resources/diagnostics/CachedPublicDiagnostic.bsl
@@ -0,0 +1,23 @@
+#Область ПрограммныйИнтерфейс
+
+Процедура Метод1()
+
+КонецПроцедуры
+
+#КонецОбласти
+
+#Область СлужебныйПрограммныйИнтерфейс
+
+Процедура Метод1()
+
+КонецПроцедуры
+
+#КонецОбласти
+
+#Область public
+
+Процедура Метод1()
+
+КонецПроцедуры
+
+#КонецОбласти

From 5dcb91b7aad10c87019763a70fc0a5493d55f8b9 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 8 May 2020 11:43:40 +0300
Subject: [PATCH 274/444] precommit

---
 docs/diagnostics/index.md                              |  5 +++--
 docs/en/diagnostics/index.md                           |  5 +++--
 .../configuration/parameters-schema.json               | 10 ++++++++++
 .../bsl/languageserver/configuration/schema.json       |  3 +++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index bced0c76ef5..df5706650b9 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **105**
+Общее количество: **106**
 
-* Дефект кода: **67**
+* Дефект кода: **68**
 * Уязвимость: **2**
 * Ошибка: **33**
 * Потенциальная уязвимость: **3**
@@ -18,6 +18,7 @@
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
 | --- | --- | :-: | --- | --- | --- |
 | [BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Нарушение правил работы с транзакциями для метода 'НачатьТранзакцию' | Да | Важный | Ошибка | `standard` |
+| [CachedPublic](CachedPublic.md) | Кеширование программного интерфейса | Да | Важный | Дефект кода | `standard`<br/>`design` |
 | [CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Каноническое написание ключевых слов | Да | Информационный | Дефект кода | `standard` |
 | [CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Определения методов должны размещаться перед операторами тела модуля | Да | Блокирующий | Ошибка | `error` |
 | [CodeOutOfRegion](CodeOutOfRegion.md) | Код расположен вне области | Да | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index c712c1ff135..e0c9cb13820 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,16 +8,17 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **105**
+Total: **106**
 
 * Error: **33**
-* Code smell: **67**
+* Code smell: **68**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
 | Key | Name| Enabled by default | Severity | Type | Tags |
 | --- | --- | :-: | --- | --- | --- |
 | [BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Violating transaction rules for the 'BeginTransaction' method | Yes | Major | Error | `standard` |
+| [CachedPublic](CachedPublic.md) | Cached public methods | Yes | Major | Code smell | `standard`<br/>`design` |
 | [CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Canonical keyword writing | Yes | Info | Code smell | `standard` |
 | [CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Method definitions must be placed before the module body operators | Yes | Blocker | Error | `error` |
 | [CodeOutOfRegion](CodeOutOfRegion.md) | Code out of region | Yes | Info | Code smell | `standard` |
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 f50dee385b4..9fc7822f6e4 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,16 @@
             "title": "Violating transaction rules for the 'BeginTransaction' method",
             "$id": "#/definitions/BeginTransactionBeforeTryCatch"
         },
+        "CachedPublic": {
+            "description": "Cached public methods",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Cached public methods",
+            "$id": "#/definitions/CachedPublic"
+        },
         "CanonicalSpellingKeywords": {
             "description": "Canonical keyword writing",
             "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 d89278f4b78..ca19c891e6f 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 @@
                 "BeginTransactionBeforeTryCatch": {
                     "$ref": "parameters-schema.json#/definitions/BeginTransactionBeforeTryCatch"
                 },
+                "CachedPublic": {
+                    "$ref": "parameters-schema.json#/definitions/CachedPublic"
+                },
                 "CanonicalSpellingKeywords": {
                     "$ref": "parameters-schema.json#/definitions/CanonicalSpellingKeywords"
                 },

From 5982cb3309ec2d22d2e97f2cd4a3e36615d80035 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 8 May 2020 12:07:19 +0300
Subject: [PATCH 275/444] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20=D0=B4=D0=BB=D1=8F=20=D0=B4?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B2=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/NewCodeAction.md | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/NewCodeAction.md

diff --git a/.github/ISSUE_TEMPLATE/NewCodeAction.md b/.github/ISSUE_TEMPLATE/NewCodeAction.md
new file mode 100644
index 00000000000..26e073f42a2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/NewCodeAction.md
@@ -0,0 +1,30 @@
+---
+name: Новое действие
+about: Добавление нового действия (CodeAction)
+title: '[NEW]'
+labels: component/codeAction
+assignees: ''
+
+---
+
+## Описание назначения, идеи
+<!-- Например: Добавить возможность переименования локального метода в модуле ....  -->
+
+## Тип действия (смысловая составляющая)
+
+<!-- Можно поставить x (на латинице) либо после сохранения кликнуть мышкой -->
+* [ ] :syringe: Исправление ошибки (`QuickFix`)
+* [ ] :scissors: Рефакторинг кода (`Refactor`)
+* [ ] :memo: Шаблон кода (`Template`, `Snippet`)
+* [ ] :mushroom: Другое
+
+## Область применения (привязка  создаваемого действия)
+
+<!-- Можно поставить x (на латинице) либо после сохранения кликнуть мышкой -->
+* [ ] :interrobang: Замечание диагностики
+* [ ] :bookmark_tabs: Выделенный пользователем блок кода
+* [ ] :book: Действие над файлом
+* [ ] :ghost: Другое
+
+## Дополнительная информация
+<!-- Можно добавить любую информацию, которая может быть полезной при реализации -->

From 687f2e7b8ce60c2064cd679a4545808b58b16d8e Mon Sep 17 00:00:00 2001
From: Evgeniy Vanzhula <minimajack@gmail.com>
Date: Mon, 11 May 2020 12:08:16 +0300
Subject: [PATCH 276/444] Update gh-pages.yml

---
 .github/workflows/gh-pages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index cff66cc8e24..26f54b6cfd3 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip install --upgrade pip
-        pip install mkdocs mkdocs-material pygments-bsl
+        pip install mkdocs mkdocs-material==5.0.0 pygments-bsl
     
     - name: Dowload latest GitHub Pages
       run: |

From 9d0a90144559ad84e5e3535cb969e29016937bef Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 11 May 2020 22:13:06 +0300
Subject: [PATCH 277/444] Update benchmark.yml

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 5002e68c47e..1c2cd4369fb 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Benchmark:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Checkout project
         uses: actions/checkout@v2

From 4652afce27b5a28e217af2137f58e3ffe88d9275 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 11 May 2020 22:26:45 +0300
Subject: [PATCH 278/444] =?UTF-8?q?=D0=91=D0=B0=D0=BC=D0=BF=20=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B8=20python=20install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 1c2cd4369fb..c0538220160 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -23,7 +23,7 @@ jobs:
         run: ./gradlew jar
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: "3.7"
 

From 075b484e613eb117468b8cae44913d531569f427 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 11 May 2020 23:44:04 +0300
Subject: [PATCH 279/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20EXCEPT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Вне зависимости от включения/выключения диагностики, если mode = except, диагностика должна исключаться
---
 .../languageserver/diagnostics/DiagnosticSupplier.java    | 5 ++++-
 .../diagnostics/DiagnosticSupplierTest.java               | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index 02058ea6ce1..d494f1a3e2b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -142,11 +142,14 @@ private boolean isEnabled(DiagnosticInfo diagnosticInfo, DiagnosticsOptions diag
     boolean enabledDirectly = diagnosticConfiguration != null
       && diagnosticConfiguration.isLeft()
       && diagnosticConfiguration.getLeft();
+    boolean disabledDirectly = diagnosticConfiguration != null
+      && diagnosticConfiguration.isLeft()
+      && !diagnosticConfiguration.getLeft();
     boolean hasDefinedSetting = enabledDirectly || hasCustomConfiguration;
 
     boolean passedAllMode = mode == Mode.ALL;
     boolean passedOnlyMode = mode == Mode.ONLY && hasDefinedSetting;
-    boolean passedExcept = mode == Mode.EXCEPT && !hasDefinedSetting;
+    boolean passedExcept = mode == Mode.EXCEPT && !(hasDefinedSetting || disabledDirectly);
     boolean passedOn = mode == Mode.ON && (activatedByDefault || hasDefinedSetting);
 
     return passedOn
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
index ab3dc740032..8d2233ac458 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplierTest.java
@@ -368,16 +368,16 @@ void testDiagnosticModeOnly() {
     // when
     lsConfiguration.getDiagnosticsOptions().setMode(Mode.ONLY);
     Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
-    rules.put("Typo", Either.forLeft(true));
+    rules.put("Typo", Either.forLeft(false));
     rules.put("TooManyReturns", Either.forLeft(true));
 
     lsConfiguration.getDiagnosticsOptions().setParameters(rules);
     List<BSLDiagnostic> diagnostics = diagnosticSupplier.getDiagnosticInstances(documentContext);
 
     assertThat(diagnostics)
-      .hasSize(2)
+      .hasSize(1)
       .flatExtracting(Object::getClass)
-      .contains(TypoDiagnostic.class)
+      .doesNotContain(TypoDiagnostic.class)
       .contains(TooManyReturnsDiagnostic.class)
     ;
   }
@@ -392,7 +392,7 @@ void testDiagnosticModeExcept() {
     // when
     lsConfiguration.getDiagnosticsOptions().setMode(Mode.EXCEPT);
     Map<String, Either<Boolean, Map<String, Object>>> rules = new HashMap<>();
-    rules.put("Typo", Either.forLeft(true));
+    rules.put("Typo", Either.forLeft(false));
     rules.put("TooManyReturns", Either.forLeft(true));
 
     lsConfiguration.getDiagnosticsOptions().setParameters(rules);

From d9982a5c42aa2ce2bb4cdda706bb351fa739f5fd Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 6 May 2020 17:57:13 +0300
Subject: [PATCH 280/444] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=86=D0=B5=D0=BF?=
 =?UTF-8?q?=D1=82=20=D0=B4=D0=B2=D0=BE=D0=B9=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=85=D0=BE=D0=B4=D0=B0=20=D1=81=20=D1=81?=
 =?UTF-8?q?=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/cli/AnalyzeCommand.java    |  5 +++++
 .../context/DocumentContext.java              | 10 +++-------
 .../languageserver/context/ServerContext.java | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index b4ca21035e2..49df60e3acd 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -165,6 +165,11 @@ public Integer call() {
 
     Collection<File> files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
 
+    if (!silentMode) {
+      System.out.println("Populating context...");
+    }
+    context.populateContext(files);
+
     List<FileInfo> fileInfos;
     if (silentMode) {
       fileInfos = files.parallelStream()
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index f0491ddfa1e..b5a3027834a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -195,13 +195,14 @@ public Optional<MDObjectBase> getMdObject() {
 
   public void rebuild(String content) {
     computeLock.lock();
-    clear();
+    clearSecondaryData();
     this.content = content;
     tokenizer = new Tokenizer(content);
     computeLock.unlock();
   }
 
   public void clearSecondaryData() {
+    computeLock.lock();
     content = null;
     contentList.clear();
     tokenizer = null;
@@ -210,12 +211,7 @@ public void clearSecondaryData() {
     cyclomaticComplexityData.clear();
     metrics.clear();
     diagnosticIgnoranceData.clear();
-  }
-
-  private void clear() {
-    clearSecondaryData();
-
-    symbolTree.clear();
+    computeLock.unlock();
   }
 
   private static FileType computeFileType(URI uri) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index d4b62c01410..e96364fec06 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -24,11 +24,16 @@
 import com.github._1c_syntax.mdclasses.metadata.Configuration;
 import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.utils.Lazy;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.TextDocumentItem;
 
 import javax.annotation.CheckForNull;
+import java.io.File;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -47,6 +52,14 @@ public ServerContext(@CheckForNull Path configurationRoot) {
     this.configurationRoot = configurationRoot;
   }
 
+  public void populateContext(Collection<File> uris) {
+    uris.parallelStream().forEach(file -> {
+      DocumentContext documentContext = addDocument(file);
+      documentContext.getSymbolTree();
+      documentContext.clearSecondaryData();
+    });
+  }
+
   public Map<URI, DocumentContext> getDocuments() {
     return Collections.unmodifiableMap(documents);
   }
@@ -61,6 +74,12 @@ public DocumentContext getDocument(URI uri) {
     return documents.get(Absolute.uri(uri));
   }
 
+  @SneakyThrows
+  public DocumentContext addDocument(File file) {
+    String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+    return addDocument(file.toURI(), content);
+  }
+
   public DocumentContext addDocument(URI uri, String content) {
     URI absoluteURI = Absolute.uri(uri);
 

From 3417329c90e488925f384f970ac7106098e342f9 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 8 May 2020 17:55:47 +0300
Subject: [PATCH 281/444] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=B0=20=D0=BD=D0=B0=20=D0=B1=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D1=80=D0=BD=D1=8F=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B8?=
 =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/BSLLanguageServer.java |  1 +
 .../languageserver/cli/AnalyzeCommand.java    |  5 +--
 .../languageserver/context/ServerContext.java | 31 ++++++++++++++++---
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
index 06980c45f30..e5f55c6a1ae 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java
@@ -68,6 +68,7 @@ public BSLLanguageServer() {
   public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
 
     setConfigurationRoot(params);
+    CompletableFuture.runAsync(context::populateContext);
 
     ServerCapabilities capabilities = new ServerCapabilities();
     capabilities.setTextDocumentSync(TextDocumentSyncKind.Full);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
index 49df60e3acd..7ae3e76077c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java
@@ -164,10 +164,7 @@ public Integer call() {
     diagnosticProvider = new DiagnosticProvider(diagnosticSupplier);
 
     Collection<File> files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
-
-    if (!silentMode) {
-      System.out.println("Populating context...");
-    }
+    
     context.populateContext(files);
 
     List<FileInfo> fileInfos;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index e96364fec06..a7e5c638460 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -25,6 +25,7 @@
 import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.lsp4j.TextDocumentItem;
 
@@ -38,6 +39,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@Slf4j
 public class ServerContext {
   private final Map<URI, DocumentContext> documents = Collections.synchronizedMap(new HashMap<>());
   private final Lazy<Configuration> configurationMetadata = new Lazy<>(this::computeConfigurationMetadata);
@@ -52,12 +54,33 @@ public ServerContext(@CheckForNull Path configurationRoot) {
     this.configurationRoot = configurationRoot;
   }
 
+  public void populateContext() {
+    if (configurationRoot == null) {
+      LOGGER.info("Can't populate server context. Configuration root is not defined.");
+      return;
+    }
+    LOGGER.info("Finding files to populate context...");
+    Collection<File> files = FileUtils.listFiles(
+      configurationRoot.toFile(),
+      new String[]{"bsl", "os"},
+      true
+    );
+    populateContext(files);
+  }
+
   public void populateContext(Collection<File> uris) {
-    uris.parallelStream().forEach(file -> {
-      DocumentContext documentContext = addDocument(file);
-      documentContext.getSymbolTree();
-      documentContext.clearSecondaryData();
+    LOGGER.info("Populating context...");
+
+    uris.parallelStream().forEach((File file) -> {
+      DocumentContext documentContext = getDocument(file.toURI());
+      if (documentContext == null) {
+        documentContext = addDocument(file);
+        documentContext.getSymbolTree();
+        documentContext.clearSecondaryData();
+      }
     });
+
+    LOGGER.info("Context populated.");
   }
 
   public Map<URI, DocumentContext> getDocuments() {

From df1667dbd23121d45c40e7ec3c8109d0bf5b22a6 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 11 May 2020 23:12:02 +0300
Subject: [PATCH 282/444] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20debug=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsl/languageserver/context/ServerContext.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index a7e5c638460..cc0a676ae67 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -59,7 +59,7 @@ public void populateContext() {
       LOGGER.info("Can't populate server context. Configuration root is not defined.");
       return;
     }
-    LOGGER.info("Finding files to populate context...");
+    LOGGER.debug("Finding files to populate context...");
     Collection<File> files = FileUtils.listFiles(
       configurationRoot.toFile(),
       new String[]{"bsl", "os"},
@@ -69,7 +69,7 @@ public void populateContext() {
   }
 
   public void populateContext(Collection<File> uris) {
-    LOGGER.info("Populating context...");
+    LOGGER.debug("Populating context...");
 
     uris.parallelStream().forEach((File file) -> {
       DocumentContext documentContext = getDocument(file.toURI());
@@ -80,7 +80,7 @@ public void populateContext(Collection<File> uris) {
       }
     });
 
-    LOGGER.info("Context populated.");
+    LOGGER.debug("Context populated.");
   }
 
   public Map<URI, DocumentContext> getDocuments() {

From fd60a4dfe5fe1f8b36e130141777e19a4858c32e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 12 May 2020 00:16:34 +0300
Subject: [PATCH 283/444] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20populate=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/context/ServerContextTest.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
index 515eb9aa948..f8995581aec 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContextTest.java
@@ -74,4 +74,19 @@ void testErrorConfigurationMetadata() {
     assertThat(configurationMetadata.getModulesByType()).hasSize(0);
   }
 
+  @Test
+  void testPopulateContext() {
+    // given
+    Path path = Absolute.path(PATH_TO_METADATA);
+    ServerContext serverContext = new ServerContext(path);
+
+    assertThat(serverContext.getDocuments()).hasSize(0);
+
+    // when
+    serverContext.populateContext();
+
+    // then
+    assertThat(serverContext.getDocuments()).hasSizeGreaterThan(0);
+  }
+
 }

From 8c520b3d379da66b4353795340877722703822f5 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 12 May 2020 10:06:31 +0300
Subject: [PATCH 284/444] =?UTF-8?q?SemicolonPresence=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B1=D0=BE=D1=80=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/SemicolonPresenceDiagnostic.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SemicolonPresenceDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SemicolonPresenceDiagnostic.java
index 40701fafcf1..1908184fc5b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SemicolonPresenceDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SemicolonPresenceDiagnostic.java
@@ -30,7 +30,6 @@
 import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
-import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -60,15 +59,15 @@ public SemicolonPresenceDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitStatement(BSLParser.StatementContext ctx) {
 
-    if (Trees.treeContainsErrors(ctx)) {
-      return ctx;
-    }
+    if (ctx.preprocessor() == null
+      && ctx.SEMICOLON() == null
+      && ctx.getStop() != null) {
 
-    if (ctx.preprocessor() == null && ctx.SEMICOLON() == null) {
-      Token lastToken = ctx.getStop();
-      if (lastToken != null) {
-        diagnosticStorage.addDiagnostic(lastToken);
+      if (Trees.treeContainsErrors(ctx)) {
+        return ctx;
       }
+
+      diagnosticStorage.addDiagnostic(ctx.getStop());
     }
     return super.visitStatement(ctx);
   }

From a66c02fc57815706dfe3346d067ceda9a9703609 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 12 May 2020 11:30:10 +0300
Subject: [PATCH 285/444] =?UTF-8?q?FunctionShouldHaveReturn=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D1=80=D0=B0=D0=B7=D0=B1=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/FunctionShouldHaveReturnDiagnostic.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionShouldHaveReturnDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionShouldHaveReturnDiagnostic.java
index 2b462c98ece..24ab0bbf3f1 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionShouldHaveReturnDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionShouldHaveReturnDiagnostic.java
@@ -51,13 +51,12 @@ public FunctionShouldHaveReturnDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
 
-    if (ctx.ENDFUNCTION_KEYWORD() == null
-      || Trees.treeContainsErrors(ctx)) {
+    if (ctx.ENDFUNCTION_KEYWORD() == null) {
       return ctx;
     }
 
     Collection<ParseTree> tokens = Trees.findAllTokenNodes(ctx, BSLLexer.RETURN_KEYWORD);
-    if (tokens.isEmpty()) {
+    if (tokens.isEmpty() && !Trees.treeContainsErrors(ctx)) {
       BSLParser.SubNameContext subName = ctx.funcDeclaration().subName();
       diagnosticStorage.addDiagnostic(subName);
     }

From 88c042e12979e2167e70863046aa12b7ae202c38 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 12 May 2020 18:25:20 +0300
Subject: [PATCH 286/444] docs link fix

---
 docs/diagnostics/CompilationDirectiveNeedLess.md    | 2 +-
 docs/en/diagnostics/CompilationDirectiveNeedLess.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/diagnostics/CompilationDirectiveNeedLess.md b/docs/diagnostics/CompilationDirectiveNeedLess.md
index c976e86427b..e56511559d1 100644
--- a/docs/diagnostics/CompilationDirectiveNeedLess.md
+++ b/docs/diagnostics/CompilationDirectiveNeedLess.md
@@ -23,7 +23,7 @@
 процедуры (функции) доступны в конечном итоге.
 
 ## Источники
-* Источник: [Использование директив компиляции и инструкций препроцессора](https://its.1c.ru/db/v8std#content:453:hdoc)
+* Источник: [Использование директив компиляции и инструкций препроцессора](https://its.1c.ru/db/v8std#content:439:hdoc)
 
 ## Сниппеты
 
diff --git a/docs/en/diagnostics/CompilationDirectiveNeedLess.md b/docs/en/diagnostics/CompilationDirectiveNeedLess.md
index 56ab7a91555..4a8b04fd05d 100644
--- a/docs/en/diagnostics/CompilationDirectiveNeedLess.md
+++ b/docs/en/diagnostics/CompilationDirectiveNeedLess.md
@@ -21,7 +21,7 @@ In server or client common modules, the execution context is obvious, so there i
 
 ## Sources
 
-- Source: [The use of compilation directives and preprocessor instructions(RUS)](https://its.1c.ru/db/v8std#content:453:hdoc)
+- Source: [The use of compilation directives and preprocessor instructions(RUS)](https://its.1c.ru/db/v8std#content:439:hdoc)
 
 ## Snippets
 

From 508dff7f3684fa0f20951b409b78c83880b15a92 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Tue, 12 May 2020 21:28:50 +0300
Subject: [PATCH 287/444] MethodSize miniopt

---
 .../bsl/languageserver/diagnostics/MethodSizeDiagnostic.java  | 2 +-
 src/test/resources/diagnostics/MethodSizeDiagnostic.bsl       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic.java
index 9077a80aafa..3678287b87d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MethodSizeDiagnostic.java
@@ -84,7 +84,7 @@ private boolean methodSizeExceedsLimit(int methodSize) {
   }
 
   private static int methodSize(BSLParser.SubCodeBlockContext ctx) {
-    if (ctx.getTokens().isEmpty()) {
+    if (ctx.codeBlock().getChildCount() == 0) {
       return 0;
     }
     Token start = ctx.getStart();
diff --git a/src/test/resources/diagnostics/MethodSizeDiagnostic.bsl b/src/test/resources/diagnostics/MethodSizeDiagnostic.bsl
index 6d21547fbf3..073b4ce4f91 100644
--- a/src/test/resources/diagnostics/MethodSizeDiagnostic.bsl
+++ b/src/test/resources/diagnostics/MethodSizeDiagnostic.bsl
@@ -829,3 +829,7 @@
     А = 0;
 
 КонецФункции
+
+Функция А(А=0)
+
+КонецФункции

From 6af0f549375c6e915b0229e1b2dd94d6d22500f7 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 07:02:43 +0300
Subject: [PATCH 288/444] CommonModuleNameWordsDiagnostic

---
 docs/diagnostics/CommonModuleNameWords.md     |  41 +++++++
 docs/diagnostics/index.md                     |   5 +-
 docs/en/diagnostics/CommonModuleNameWords.md  |  44 +++++++
 docs/en/diagnostics/index.md                  |   5 +-
 .../AbstractCommonModuleNameDiagnostic.java   |  14 ++-
 .../CommonModuleNameWordsDiagnostic.java      |  73 ++++++++++++
 .../configuration/parameters-schema.json      |  18 +++
 .../languageserver/configuration/schema.json  |   3 +
 ...monModuleNameWordsDiagnostic_en.properties |   3 +
 ...monModuleNameWordsDiagnostic_ru.properties |   3 +
 .../CommonModuleNameWordsDiagnosticTest.java  | 111 ++++++++++++++++++
 .../CommonModuleNameWordsDiagnostic.bsl       |   1 +
 12 files changed, 314 insertions(+), 7 deletions(-)
 create mode 100644 docs/diagnostics/CommonModuleNameWords.md
 create mode 100644 docs/en/diagnostics/CommonModuleNameWords.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleNameWordsDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleNameWords.md b/docs/diagnostics/CommonModuleNameWords.md
new file mode 100644
index 00000000000..c533bdb6c7a
--- /dev/null
+++ b/docs/diagnostics/CommonModuleNameWords.md
@@ -0,0 +1,41 @@
+# Нерекомендуемое имя общего модуля (CommonModuleNameWords)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+
+## Параметры 
+
+| Имя | Тип | Описание | Значение по умолчанию |
+| :-: | :-: | :-- | :-: |
+| `words` | `Строка` | ```Нерекомендуемые слова``` | `````` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+Рекомендуется избегать в названии общего модуля таких общих слов как "Процедуры", "Функции", "Обработчики",
+ "Модуль", "Функциональность" и т.п.
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+
+* Источник: [Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.1)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleNameWords-off
+// BSLLS:CommonModuleNameWords-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleNameWords": {
+    "words": ""
+}
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index df5706650b9..ad208c20421 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **106**
+Общее количество: **107**
 
-* Дефект кода: **68**
+* Дефект кода: **69**
 * Уязвимость: **2**
 * Ошибка: **33**
 * Потенциальная уязвимость: **3**
@@ -33,6 +33,7 @@
 | [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Пропущен постфикс "Глобальный" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`brainoverload` |
 | [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Глобальный модуль с постфиксом "Клиент" | Да | Важный | Дефект кода | `standard` |
 | [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Пропущен постфикс "ВызовСервера" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameWords](CommonModuleNameWords.md) | Нерекомендуемое имя общего модуля | Да | Информационный | Дефект кода | `standard` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Директивы компиляции методов | Да | Важный | Дефект кода | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Лишняя директива компиляции | Да | Важный | Дефект кода | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Подряд идущие пустые строки | Да | Информационный | Дефект кода | `badpractice` |
diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
new file mode 100644
index 00000000000..53f911011d0
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -0,0 +1,44 @@
+# Unrecommended common module name (CommonModuleNameWords)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+
+## Parameters 
+
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `words` | `String` | ```Unrecommended words``` | `````` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleNameWords-off
+// BSLLS:CommonModuleNameWords-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleNameWords": {
+    "words": ""
+}
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index e0c9cb13820..1ab3ba79e4e 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **106**
+Total: **107**
 
 * Error: **33**
-* Code smell: **68**
+* Code smell: **69**
 * Vulnerability: **2**
 * Security Hotspot: **3**
 
@@ -33,6 +33,7 @@ Total: **106**
 | [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
 | [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
 | [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameWords](CommonModuleNameWords.md) | Unrecommended common module name | Yes | Info | Code smell | `standard` |
 | [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
 | [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
 | [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 3b54681df91..f6097d7fda2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -27,13 +27,17 @@
 import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
 
-  private final Pattern pattern;
+  protected Pattern pattern;
+
+  public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info) {
+    super(info);
+
+  }
 
   public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
     super(info);
@@ -54,10 +58,14 @@ protected void check(DocumentContext documentContext) {
       .filter(this::flagsCheck)
       .map(MDObjectBase::getName)
       .map(pattern::matcher)
-      .filter(Predicate.not(Matcher::find))
+      .filter(this::matchCheck)
       .ifPresent(commonModule -> diagnosticStorage.addDiagnostic(documentContext.getTokensFromDefaultChannel().get(0)));
   }
 
   protected abstract boolean flagsCheck(CommonModule commonModule);
 
+  protected boolean matchCheck(Matcher matcher) {
+    return !matcher.find();
+  }
+
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
new file mode 100644
index 00000000000..405ff32ec55
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
@@ -0,0 +1,73 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
+
+import java.util.regex.Matcher;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.INFO,
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.STANDARD
+  }
+
+)
+public class CommonModuleNameWordsDiagnostic extends AbstractCommonModuleNameDiagnostic {
+
+  private static final String DEFAULT_WORDS = "процедуры|procedures" +
+    "|функции|functions" +
+    "|обработчики|handlers" +
+    "|модуль|module" +
+    "|функциональность|functionality";
+
+  @DiagnosticParameter(
+    type = String.class
+  )
+  private String words = DEFAULT_WORDS;
+
+  public CommonModuleNameWordsDiagnostic(DiagnosticInfo info) {
+    super(info);
+    pattern = CaseInsensitivePattern.compile(words);
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+    return true;
+  }
+
+  @Override
+  protected boolean matchCheck(Matcher matcher) {
+    return matcher.find();
+  }
+
+}
+
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 9fc7822f6e4..f54eec0b8d4 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
@@ -186,6 +186,24 @@
             "title": "Missed postfix \"ServerCall\"",
             "$id": "#/definitions/CommonModuleNameServerCall"
         },
+        "CommonModuleNameWords": {
+            "description": "Unrecommended common module name",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Unrecommended common module name",
+            "properties": {
+                "words": {
+                    "description": "Unrecommended words",
+                    "default": "",
+                    "type": "string",
+                    "title": "Unrecommended words"
+                }
+            },
+            "$id": "#/definitions/CommonModuleNameWords"
+        },
         "CompilationDirectiveLost": {
             "description": "Methods compilation directive",
             "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 ca19c891e6f..f6fdce501e1 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
@@ -71,6 +71,9 @@
                 "CommonModuleNameServerCall": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleNameServerCall"
                 },
+                "CommonModuleNameWords": {
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleNameWords"
+                },
                 "CompilationDirectiveLost": {
                     "$ref": "parameters-schema.json#/definitions/CompilationDirectiveLost"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_en.properties
new file mode 100644
index 00000000000..5180bc94488
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_en.properties
@@ -0,0 +1,3 @@
+diagnosticMessage=Rename common module
+diagnosticName=Unrecommended common module name
+words=Unrecommended words
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_ru.properties
new file mode 100644
index 00000000000..b034196d17b
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic_ru.properties
@@ -0,0 +1,3 @@
+diagnosticMessage=Переименуйте общий модуль
+diagnosticName=Нерекомендуемое имя общего модуля
+words=Нерекомендуемые слова
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
new file mode 100644
index 00000000000..6e8867e6281
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
@@ -0,0 +1,111 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleNameWordsDiagnosticTest extends AbstractDiagnosticTest<CommonModuleNameWordsDiagnostic> {
+
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  CommonModuleNameWordsDiagnosticTest() {
+    super(CommonModuleNameWordsDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+  @Test
+  void test() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("СвойМодуль");
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
+  @Test
+  void testNegative() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("имя");
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
+
diff --git a/src/test/resources/diagnostics/CommonModuleNameWordsDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleNameWordsDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleNameWordsDiagnostic.bsl
@@ -0,0 +1 @@
+

From d8cae63025813614ac0c2ec550a7de5f16f7fdfd Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 11:59:29 +0300
Subject: [PATCH 289/444] CommonModuleNameWords configure

---
 docs/en/diagnostics/CommonModuleNameWords.md  |  2 +-
 .../AbstractCommonModuleNameDiagnostic.java   |  7 ------
 .../CommonModuleNameWordsDiagnostic.java      | 14 ++++++++++-
 .../CommonModuleNameWordsDiagnosticTest.java  | 25 +++++++++++++++++++
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
index 53f911011d0..c7eb16dc71f 100644
--- a/docs/en/diagnostics/CommonModuleNameWords.md
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `standard` |
+| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `standard` |
 
 ## Parameters 
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index f6097d7fda2..6645e15b907 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -34,16 +34,9 @@ abstract class AbstractCommonModuleNameDiagnostic extends AbstractDiagnostic {
 
   protected Pattern pattern;
 
-  public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info) {
-    super(info);
-
-  }
-
   public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
     super(info);
-
     pattern = CaseInsensitivePattern.compile(regexp);
-
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
index 405ff32ec55..cd05f9303be 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
@@ -24,17 +24,24 @@
 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.DiagnosticParameter;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
+import java.util.Map;
 import java.util.regex.Matcher;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
   severity = DiagnosticSeverity.INFO,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
   minutesToFix = 5,
   tags = {
     DiagnosticTag.STANDARD
@@ -55,7 +62,12 @@ public class CommonModuleNameWordsDiagnostic extends AbstractCommonModuleNameDia
   private String words = DEFAULT_WORDS;
 
   public CommonModuleNameWordsDiagnostic(DiagnosticInfo info) {
-    super(info);
+    super(info, DEFAULT_WORDS);
+  }
+
+  @Override
+  public void configure(Map<String, Object> configuration) {
+    super.configure(configuration);
     pattern = CaseInsensitivePattern.compile(words);
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
index 6e8867e6281..1abd72f1ef3 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
@@ -34,6 +34,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
@@ -89,6 +90,30 @@ void testNegative() {
 
   }
 
+  @Test
+  void testConfigure() {
+
+    getDocumentContextFromFile();
+
+    Map<String, Object> configuration = diagnosticInstance.getInfo().getDefaultConfiguration();
+    configuration.put("words", "мой");
+    diagnosticInstance.configure(configuration);
+
+    // given
+    when(module.getName()).thenReturn("МойОбщий");
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
+
   @SneakyThrows
   void getDocumentContextFromFile() {
 

From e6eec3f59cc2075ae99f2d58712b0311df5dcad1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 13 May 2020 13:56:02 +0300
Subject: [PATCH 290/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BF=D1=80=D0=BE=D0=B1=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD=D0=BE=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BE=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/CommonModuleNameWords.md                   | 6 +++---
 docs/en/diagnostics/CommonModuleNameWords.md                | 4 ++--
 .../diagnostics/CommonModuleNameWordsDiagnostic.java        | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/diagnostics/CommonModuleNameWords.md b/docs/diagnostics/CommonModuleNameWords.md
index c533bdb6c7a..f1f1187e201 100644
--- a/docs/diagnostics/CommonModuleNameWords.md
+++ b/docs/diagnostics/CommonModuleNameWords.md
@@ -2,13 +2,13 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL`<br/>`OS` | `Информационный` | `Да` | `1` | `standard` |
+| `Дефект кода` | `BSL` | `Информационный` | `Да` | `5` | `standard` |
 
 ## Параметры 
 
 | Имя | Тип | Описание | Значение по умолчанию |
 | :-: | :-: | :-- | :-: |
-| `words` | `Строка` | ```Нерекомендуемые слова``` | `````` |
+| `words` | `Строка` | ```Нерекомендуемые слова``` | ```процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
@@ -36,6 +36,6 @@
 
 ```json
 "CommonModuleNameWords": {
-    "words": ""
+    "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality"
 }
 ```
diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
index c7eb16dc71f..17c055b6d41 100644
--- a/docs/en/diagnostics/CommonModuleNameWords.md
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -8,7 +8,7 @@
 
 | Name | Type | Description | Default value |
 | :-: | :-: | :-- | :-: |
-| `words` | `String` | ```Unrecommended words``` | `````` |
+| `words` | `String` | ```Unrecommended words``` | ```процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -39,6 +39,6 @@
 
 ```json
 "CommonModuleNameWords": {
-    "words": ""
+    "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality"
 }
 ```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
index cd05f9303be..1763f4bc2d0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnostic.java
@@ -57,7 +57,8 @@ public class CommonModuleNameWordsDiagnostic extends AbstractCommonModuleNameDia
     "|функциональность|functionality";
 
   @DiagnosticParameter(
-    type = String.class
+    type = String.class,
+    defaultValue = DEFAULT_WORDS
   )
   private String words = DEFAULT_WORDS;
 

From c175befc2f024fb85a051dde5d23daedf96dae3d Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 14:07:49 +0300
Subject: [PATCH 291/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/features/ConfigurationFile.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/docs/features/ConfigurationFile.md b/docs/features/ConfigurationFile.md
index 60d326b9ca1..fb33c40d8c8 100644
--- a/docs/features/ConfigurationFile.md
+++ b/docs/features/ConfigurationFile.md
@@ -7,13 +7,17 @@ BSL Language Server предоставляет возможность измен
 
 |Наименование|Тип|Описание|
 |:--|:-:|:--|
-|`diagnosticLanguage`|`Строка`|Этот параметр устанавливает язык отображения диагностированных замечаний. На данный момент поддерживаются два языка:<br/>* `ru` - для русского языка (*используется по умолчанию*)<br/>* `en` - для английского языка|
-|`showCognitiveComplexityCodeLens`|`Булево`|В продвинутых редакторах кода/IDE *(например [Visual Studio Code](https://code.visualstudio.com/))*, этим параметром включается отображение значения [когнитивной сложности](../diagnostics/CognitiveComplexity.md) метода над его определением. По умолчанию параметр включен (*установлен в `true`*)|
-|`showCyclomaticComplexityCodeLens`|`Булево`|По аналогии с `showCognitiveComplexityCodeLens`, этот параметр включает отображение значения [цикломатической сложности](../diagnostics/CyclomaticComplexity.md) метода. По умолчанию параметр включен (*установлен в `true`*)|
-|`computeDiagnosticsTrigger`|`Строка`|С помощью этого параметра можно указать событие, при котором будет вызвана процедура анализа кода для диагностирования замечаний. Возможные значения:<br/>* `onType` - при редактировании файла (онлайн) ***на больших файлах может ЗНАЧИТЕЛЬНО замедлять редактирование***<br/>* `onSave` - при сохранении файла (*используется по умолчанию*)<br/>* `never` - анализ выполняться не будет|
-|`computeDiagnosticsSkipSupport`|`Строка`|Этим параметром настраивается режим пропуска файлов *(т.е. файлы не анализируются на предмет наличия замечаний)* **конфигурации 1С**, находящихся "на поддержке" конфигурации поставщика. Возможные значения:<br/>* `withSupport` - пропускаются все модули, находящиеся "на поддержке" *(все виды "замков")*<br/>* `withSupportLocked` - пропускаются только модули, находящиеся "на поддержке" с запретом изменений *("желтый закрытый замок")*<br/>* `never` - режим поддержки не анализируется и модули не пропускаются *(установлен по умолчанию)*|
+|`language`|`Строка`|Этот параметр устанавливает язык отображения диагностированных замечаний. На данный момент поддерживаются два языка:<br/>* `ru` - для русского языка (*используется по умолчанию*)<br/>* `en` - для английского языка|
+|`codeLens`|`JSON-Объект`|Содержит настройки отображения `линз` в продвинутых кода/IDE *(например [Visual Studio Code](https://code.visualstudio.com/))*, в которых выводится различная информация на блоком кода. Свойства объекта|
+|⤷&nbsp;&nbsp;&nbsp;`showCognitiveComplexity`|`Булево`|Включается отображение значения [когнитивной сложности](../diagnostics/CognitiveComplexity.md) метода над его определением. По умолчанию параметр включен (*установлен в `true`*)|
+|⤷&nbsp;&nbsp;&nbsp;`showCyclomaticComplexity`|`Булево`|Включает отображение значения [цикломатической сложности](../diagnostics/CyclomaticComplexity.md) метода. По умолчанию параметр включен (*установлен в `true`*)|
+|`diagnostics`|`JSON-Объект`|Содержит настройки диагностик|
+|⤷&nbsp;&nbsp;&nbsp;`computeTrigger`|`Строка`|С помощью этого параметра можно указать событие, при котором будет вызвана процедура анализа кода для диагностирования замечаний. Возможные значения:<br/>* `onType` - при редактировании файла (онлайн) ***на больших файлах может ЗНАЧИТЕЛЬНО замедлять редактирование***<br/>* `onSave` - при сохранении файла (*используется по умолчанию*)<br/>* `never` - анализ выполняться не будет|
+|⤷&nbsp;&nbsp;&nbsp;`skipSupport`|`Строка`|Этим параметром настраивается режим пропуска файлов *(т.е. файлы не анализируются на предмет наличия замечаний)* **конфигурации 1С**, находящихся "на поддержке" конфигурации поставщика. Возможные значения:<br/>* `withSupport` - пропускаются все модули, находящиеся "на поддержке" *(все виды "замков")*<br/>* `withSupportLocked` - пропускаются только модули, находящиеся "на поддержке" с запретом изменений *("желтый закрытый замок")*<br/>* `never` - режим поддержки не анализируется и модули не пропускаются *(установлен по умолчанию)*|
+|⤷&nbsp;&nbsp;&nbsp;`mode`|`Строка`|Настройка для управления режимом учета настроек диагностик. Возможные варианты:<br/>* `OFF` - Все диагностики считаются выключенными, вне зависимости от их настроек <br/>* `ON` - Все диагностики включенные по умолчанию считаются включенными, остальные - в зависимости от личных настроек <br/>* `EXCEPT` - Все диагностистики, кроме указанных, считаются включенными <br/>* `ONLY` - Только указанные диагностики считаются включенными <br/>* `ALL` - Все диагностики считаются включенными|
+|⤷&nbsp;&nbsp;&nbsp;`parameters`|`JSON-Объект`|Параметр представляет собой коллекцию настроек диагностик. Элементами коллекции являются json-объекты следующей структуры:<br/>* *ключ объекта* - строка, являющаяся ключом диагностики<br/>* *значение объекта* - может принимать либо булево значение, и тогда интерпретируется как отключение диагностики (`false`) или ее включение с параметрами по умолчанию (`true`), либо значение типа `json-объект`, представляющего собой набор настроек диагностики.<br/><br/>Ключ, включена ли по умолчанию, а также описание возможных параметров и примеры для конфигурационного файла представлены на странице с описанием каждой диагностики.|
 |`traceLog`|`Строка`|Для логирования всех запросов *(входящих и исходящих)* между **BSL Language Server** и **Language Client** из используемого редактора/IDE, в этом параметре можно указать путь к файлу лога. Путь можно указывать как абсолютный, так и относительный *(от корня анализируемого проекта)*, по умолчанию значение не заполнено.<br/><br/>**ВНИМАНИЕ**<br/><br/>* При запуске **BSL Language Server** перезаписывает указанный файл<br/>* Скорость взаимодействия между клиентом и сервером **ЗНАЧИТЕЛЬНО ЗАМЕДЛЯЕТСЯ**|
-|`diagnostics`|`JSON-Объект`|Параметр представляет собой коллекцию настроек диагностик. Элементами коллекции являются json-объекты следующей структуры:<br/>* *ключ объекта* - строка, являющаяся ключом диагностики<br/>* *значение объекта* - может принимать либо булево значение, и тогда интерпретируется как отключение диагностики (`false`) или ее включение с параметрами по умолчанию (`true`), либо значение типа `json-объект`, представляющего собой набор настроек диагностики.<br/><br/>Ключ, включена ли по умолчанию, а также описание возможных параметров и примеры для конфигурационного файла представлены на странице с описанием каждой диагностики.|
+|`configurationRoot`|`Строка`|Данный параметр предназначен для указания корневого каталога, в котором находятся файлы конфигурации 1С в каталоге проекта. Может быть полезен в случае нахождения нескольких каталогов конфигураций в одном каталоге проекта либо при сложной структуре каталога проекта. По умолчанию параметр не заполнен и `BSL Language Server` самостоятельно определяет расположение корневого каталога конфигурации|
 
 Для облегчения составления и редактирования конфигурационного файла можно использовать следующую JSON-схему:
 
@@ -28,16 +32,20 @@ https://1c-syntax.github.io/bsl-language-server/configuration/schema.json
 * Устанавливает язык сообщений диагностик - английский;
 * Изменяет настройку диагностики [LineLength - Ограничение на длину строки](../diagnostics/LineLength.md), устанавливая предел длины строки в 140 символов;
 * Отключает диагностику [MethodSize - Ограничение на размер метода](../diagnostics/MethodSize.md).
+* Включает расчет диагностик в непрерывном режиме (`computeTrigger = onType`)
 
 ```json
 {
   "$schema": "https://1c-syntax.github.io/bsl-language-server/configuration/schema.json",
-  "diagnosticLanguage": "en",
+  "language": "en",
   "diagnostics": {
-    "LineLength": {
-      "maxLineLength": 140
-    },
-    "MethodSize": false
+    "computeTrigger": "onType",
+    "parameters": {
+      "LineLength": {
+        "maxLineLength": 140
+      },
+      "MethodSize": false
+    }
   }
 }
 ```

From bf3ebf6ea3293e09da1f88e803054eb6e45185e0 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 14:17:32 +0300
Subject: [PATCH 292/444] =?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=D1=8F=20=D0=BF=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.md b/docs/index.md
index 647313e9d87..57191b0584f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -63,7 +63,7 @@ Commands:
 
 При запуске BSL Language Server в обычном режиме будет запущен сам Language Server, взаимодействующий по протоколу [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). Для взаимодействия используются stdin и stdout.
 
-По умолчанию тексты диагностик выдаются на русском языке. Для переключения языка сообщений от движка диагностик необходимо настроить параметр `diagnosticLanguage` в конфигурационном файле или вызвав событие `workspace/didChangeConfiguration`:
+По умолчанию тексты диагностик выдаются на русском языке. Для переключения языка сообщений от движка диагностик необходимо настроить параметр `language` в конфигурационном файле или вызвав событие `workspace/didChangeConfiguration`:
 
 <a id="analyze"></a>
 

From e8589511781055e8df6c3309d2597d9d4279dd73 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 13 May 2020 14:17:58 +0300
Subject: [PATCH 293/444] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=BD=D1=87=D0=BC=D0=B0=D1=80=D0=BA=D0=B0=20=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BD=D0=B0=20=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B2=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/benchmark.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index c0538220160..f6ff29eabf5 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -5,7 +5,21 @@ on:
     branches:
       - develop
       - master
+    paths:
+    - 'src/**'
+    - '.github/workflows/benchmark.yml'
+    - '.github/scripts/*.*'
+    - '*gradle*'
+    - 'gradle/wrapper/gradle-wrapper.properties'
+    - 'lombok.config'
   pull_request:
+    paths:
+    - 'src/**'
+    - '.github/workflows/benchmark.yml'
+    - '.github/scripts/*.*'
+    - '*gradle*'
+    - 'gradle/wrapper/gradle-wrapper.properties'
+    - 'lombok.config'
 
 jobs:
   Benchmark:

From 8ef79b8fc6ac5537584026fa9254a76a86d84f46 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 14:25:30 +0300
Subject: [PATCH 294/444] CommonModuleInvalidTypeDiagnostic

---
 docs/diagnostics/CommonModuleInvalidType.md   |  41 ++++
 docs/diagnostics/index.md                     |   5 +-
 .../en/diagnostics/CommonModuleInvalidType.md |  36 ++++
 docs/en/diagnostics/index.md                  |   5 +-
 .../CommonModuleInvalidTypeDiagnostic.java    |  94 +++++++++
 .../configuration/parameters-schema.json      |  12 +-
 .../languageserver/configuration/schema.json  |   3 +
 ...nModuleInvalidTypeDiagnostic_en.properties |   2 +
 ...nModuleInvalidTypeDiagnostic_ru.properties |   2 +
 ...CommonModuleInvalidTypeDiagnosticTest.java | 183 ++++++++++++++++++
 .../CommonModuleInvalidTypeDiagnostic.bsl     |   1 +
 11 files changed, 379 insertions(+), 5 deletions(-)
 create mode 100644 docs/diagnostics/CommonModuleInvalidType.md
 create mode 100644 docs/en/diagnostics/CommonModuleInvalidType.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/CommonModuleInvalidTypeDiagnostic.bsl

diff --git a/docs/diagnostics/CommonModuleInvalidType.md b/docs/diagnostics/CommonModuleInvalidType.md
new file mode 100644
index 00000000000..3170cdd5e04
--- /dev/null
+++ b/docs/diagnostics/CommonModuleInvalidType.md
@@ -0,0 +1,41 @@
+# Общий Модуль недопустимого типа (CommonModuleInvalidType)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `standard`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+
+При разработке общих модулей следует выбирать один из четырех контекстов выполнения кода:
+
+|Тип общего модуля | Пример наименования | Вызов сервера | Сервер | Внешнее соединение | Клиент(обычное приложение) | Клиент(управляемое приложение)|
+| -- | -- | -- | -- | -- | -- | -- |
+| Серверный | ОбщегоНазначения (или ОбщегоНазначенияСервер) |   | + | + | + |  
+| Серверный для вызова с клиента | ОбщегоНазначенияВызовСервера | + | + |   |   |  
+| Клиентский | ОбщегоНазначенияКлиент (или ОбщегоНазначенияГлобальный) |   |   |   | + | +
+| Клиент-серверный | ОбщегоНазначенияКлиентСервер |   | + | + | + | +|
+
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+
+* Источник: [Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:1.2)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:CommonModuleInvalidType-off
+// BSLLS:CommonModuleInvalidType-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"CommonModuleInvalidType": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index ad208c20421..468af110de6 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,11 +8,11 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **107**
+Общее количество: **108**
 
 * Дефект кода: **69**
 * Уязвимость: **2**
-* Ошибка: **33**
+* Ошибка: **34**
 * Потенциальная уязвимость: **3**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
@@ -26,6 +26,7 @@
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
+| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Общий Модуль недопустимого типа | Да | Важный | Ошибка | `standard`<br/>`unpredictable` |
 | [CommonModuleNameCached](CommonModuleNameCached.md) | Пропущен постфикс "ПовтИсп" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClient](CommonModuleNameClient.md) | Пропущен постфикс "Клиент" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Пропущен постфикс "КлиентСервер" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/docs/en/diagnostics/CommonModuleInvalidType.md b/docs/en/diagnostics/CommonModuleInvalidType.md
new file mode 100644
index 00000000000..7bf5339835e
--- /dev/null
+++ b/docs/en/diagnostics/CommonModuleInvalidType.md
@@ -0,0 +1,36 @@
+# Common module invalid type (CommonModuleInvalidType)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `standard`<br/>`unpredictable` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:CommonModuleInvalidType-off
+// BSLLS:CommonModuleInvalidType-on
+```
+
+### Parameter for config
+
+```json
+"CommonModuleInvalidType": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 1ab3ba79e4e..1c18665518d 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,9 +8,9 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **107**
+Total: **108**
 
-* Error: **33**
+* Error: **34**
 * Code smell: **69**
 * Vulnerability: **2**
 * Security Hotspot: **3**
@@ -26,6 +26,7 @@ Total: **107**
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
+| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br/>`unpredictable` |
 | [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
new file mode 100644
index 00000000000..6d0e452047c
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
@@ -0,0 +1,94 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.mdclasses.mdo.CommonModule;
+
+import java.util.regex.Matcher;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.ERROR,
+  severity = DiagnosticSeverity.MAJOR,
+  minutesToFix = 5,
+  tags = {
+    DiagnosticTag.STANDARD,
+    DiagnosticTag.UNPREDICTABLE
+  }
+
+)
+public class CommonModuleInvalidTypeDiagnostic extends AbstractCommonModuleNameDiagnostic {
+  public CommonModuleInvalidTypeDiagnostic(DiagnosticInfo info) {
+    super(info, "");
+  }
+
+  @Override
+  protected boolean flagsCheck(CommonModule commonModule) {
+
+    return !isServer(commonModule)
+      && !isServerCall(commonModule)
+      && !isClient(commonModule)
+      && !isClientServer(commonModule);
+  }
+
+  private boolean isClientServer(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && commonModule.isServer()
+      && commonModule.isExternalConnection()
+      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientManagedApplication();
+  }
+
+  private boolean isClient(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && !commonModule.isServer()
+      && !commonModule.isExternalConnection()
+      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientManagedApplication();
+  }
+
+  private boolean isServerCall(CommonModule commonModule) {
+    return commonModule.isServerCall()
+      && commonModule.isServer()
+      && !commonModule.isExternalConnection()
+      && !commonModule.isClientOrdinaryApplication()
+      && !commonModule.isClientManagedApplication();
+  }
+
+  private boolean isServer(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && commonModule.isServer()
+      && commonModule.isExternalConnection()
+      && commonModule.isClientOrdinaryApplication()
+      && !commonModule.isClientManagedApplication();
+  }
+
+  @Override
+  protected boolean matchCheck(Matcher matcher) {
+    return true;
+  }
+
+}
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 f54eec0b8d4..176c7ea9b93 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
@@ -116,6 +116,16 @@
             "title": "CommonModuleAssign",
             "$id": "#/definitions/CommonModuleAssign"
         },
+        "CommonModuleInvalidType": {
+            "description": "Common module invalid type",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Common module invalid type",
+            "$id": "#/definitions/CommonModuleInvalidType"
+        },
         "CommonModuleNameCached": {
             "description": "Missed postfix \"Cached\"",
             "default": true,
@@ -197,7 +207,7 @@
             "properties": {
                 "words": {
                     "description": "Unrecommended words",
-                    "default": "",
+                    "default": "\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b|procedures|\u0444\u0443\u043d\u043a\u0446\u0438\u0438|functions|\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438|handlers|\u043c\u043e\u0434\u0443\u043b\u044c|module|\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u044c|functionality",
                     "type": "string",
                     "title": "Unrecommended words"
                 }
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 f6fdce501e1..a7cdcb33a0e 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
@@ -50,6 +50,9 @@
                 "CommonModuleAssign": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleAssign"
                 },
+                "CommonModuleInvalidType": {
+                    "$ref": "parameters-schema.json#/definitions/CommonModuleInvalidType"
+                },
                 "CommonModuleNameCached": {
                     "$ref": "parameters-schema.json#/definitions/CommonModuleNameCached"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_en.properties
new file mode 100644
index 00000000000..10e61dec27e
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Common module invalid type
+diagnosticName=Common module invalid type
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
new file mode 100644
index 00000000000..0e5f9b0bf04
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Общий модуль недопустимого типа
+diagnosticName=Общий Модуль недопустимого типа
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
new file mode 100644
index 00000000000..a9601717fbc
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
@@ -0,0 +1,183 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class CommonModuleInvalidTypeDiagnosticTest extends AbstractDiagnosticTest<CommonModuleInvalidTypeDiagnostic> {
+  CommonModuleInvalidTypeDiagnosticTest() {
+    super(CommonModuleInvalidTypeDiagnostic.class);
+  }
+
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+  @Test
+  void testClientServer() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ПростоКлиентСервер");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
+  @Test
+  void testUnknown() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("СОшибкой");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testServerCall() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ПростоВызовСерверат");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testServer() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ПростоСервер");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testClient() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ПростоКлиент");
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @SneakyThrows
+  void getDocumentContextFromFile() {
+
+    Path path = Absolute.path(PATH_TO_METADATA);
+    Path testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    ServerContext serverContext = new ServerContext(path);
+    var configuration = serverContext.getConfiguration();
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      FileUtils.readFileToString(testFile.toFile(), StandardCharsets.UTF_8),
+      serverContext
+    ));
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
+
diff --git a/src/test/resources/diagnostics/CommonModuleInvalidTypeDiagnostic.bsl b/src/test/resources/diagnostics/CommonModuleInvalidTypeDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/CommonModuleInvalidTypeDiagnostic.bsl
@@ -0,0 +1 @@
+

From 5a7980938c373c24547eda3d0d95df7294273119 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 15:17:58 +0300
Subject: [PATCH 295/444] =?UTF-8?q?=D0=A3=D0=B7=D0=BE=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/CommonModuleInvalidType.md              | 4 ++--
 docs/diagnostics/index.md                                | 2 +-
 docs/en/diagnostics/CommonModuleInvalidType.md           | 2 +-
 docs/en/diagnostics/index.md                             | 2 +-
 .../diagnostics/CommonModuleInvalidTypeDiagnostic.java   | 9 ++++++++-
 .../CommonModuleInvalidTypeDiagnostic_ru.properties      | 2 +-
 .../CommonModuleInvalidTypeDiagnosticTest.java           | 2 +-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/diagnostics/CommonModuleInvalidType.md b/docs/diagnostics/CommonModuleInvalidType.md
index 3170cdd5e04..011e8845bb6 100644
--- a/docs/diagnostics/CommonModuleInvalidType.md
+++ b/docs/diagnostics/CommonModuleInvalidType.md
@@ -1,8 +1,8 @@
-# Общий Модуль недопустимого типа (CommonModuleInvalidType)
+# Общий модуль недопустимого типа (CommonModuleInvalidType)
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Ошибка` | `BSL`<br/>`OS` | `Важный` | `Да` | `5` | `standard`<br/>`unpredictable` |
+| `Ошибка` | `BSL` | `Важный` | `Да` | `5` | `standard`<br/>`unpredictable`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 468af110de6..36e59e005a4 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -26,7 +26,7 @@
 | [CommentedCode](CommentedCode.md) | Закомментированный фрагмент кода | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Нарушение правил работы с транзакциями для метода 'ЗафиксироватьТранзакцию' | Да | Важный | Ошибка | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | Присвоение общему модулю | Да | Блокирующий | Ошибка | `error` |
-| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Общий Модуль недопустимого типа | Да | Важный | Ошибка | `standard`<br/>`unpredictable` |
+| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Общий модуль недопустимого типа | Да | Важный | Ошибка | `standard`<br/>`unpredictable`<br/>`design` |
 | [CommonModuleNameCached](CommonModuleNameCached.md) | Пропущен постфикс "ПовтИсп" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClient](CommonModuleNameClient.md) | Пропущен постфикс "Клиент" | Да | Незначительный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Пропущен постфикс "КлиентСервер" | Да | Важный | Дефект кода | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/docs/en/diagnostics/CommonModuleInvalidType.md b/docs/en/diagnostics/CommonModuleInvalidType.md
index 7bf5339835e..4660ca77fba 100644
--- a/docs/en/diagnostics/CommonModuleInvalidType.md
+++ b/docs/en/diagnostics/CommonModuleInvalidType.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL`<br/>`OS` | `Major` | `Yes` | `5` | `standard`<br/>`unpredictable` |
+| `Error` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`unpredictable`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 1c18665518d..b9121ad6aab 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -26,7 +26,7 @@ Total: **108**
 | [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
 | [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
 | [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
-| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br/>`unpredictable` |
+| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br/>`unpredictable`<br/>`design` |
 | [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
 | [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
index 6d0e452047c..834d4586a7b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
@@ -23,20 +23,27 @@
 
 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.DiagnosticScope;
 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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 
 import java.util.regex.Matcher;
 
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
   severity = DiagnosticSeverity.MAJOR,
+  scope = DiagnosticScope.BSL,
+  modules = {
+    ModuleType.CommonModule
+  },
   minutesToFix = 5,
   tags = {
     DiagnosticTag.STANDARD,
-    DiagnosticTag.UNPREDICTABLE
+    DiagnosticTag.UNPREDICTABLE,
+    DiagnosticTag.DESIGN
   }
 
 )
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
index 0e5f9b0bf04..92b534b0a5b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic_ru.properties
@@ -1,2 +1,2 @@
 diagnosticMessage=Общий модуль недопустимого типа
-diagnosticName=Общий Модуль недопустимого типа
+diagnosticName=Общий модуль недопустимого типа
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
index a9601717fbc..08c97f7cc4a 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
@@ -103,7 +103,7 @@ void testServerCall() {
     getDocumentContextFromFile();
 
     // given
-    when(module.getName()).thenReturn("ПростоВызовСерверат");
+    when(module.getName()).thenReturn("ПростоВызовСервера");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isServerCall()).thenReturn(Boolean.TRUE);
     when(module.isExternalConnection()).thenReturn(Boolean.FALSE);

From c80823ec75d9fecfe5c5bcfcb0c81057335da1d8 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 15:32:08 +0300
Subject: [PATCH 296/444] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=20=D1=81=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=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/faq.md                | 1 +
 docs/en/index.md              | 4 +++-
 docs/en/systemRequirements.md | 1 +
 docs/faq.md                   | 1 +
 docs/index.md                 | 2 ++
 docs/systemRequirements.md    | 1 +
 6 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 docs/en/faq.md
 create mode 100644 docs/en/systemRequirements.md
 create mode 100644 docs/faq.md
 create mode 100644 docs/systemRequirements.md

diff --git a/docs/en/faq.md b/docs/en/faq.md
new file mode 100644
index 00000000000..554f7bdbbc7
--- /dev/null
+++ b/docs/en/faq.md
@@ -0,0 +1 @@
+# Frequently asked questions
diff --git a/docs/en/index.md b/docs/en/index.md
index 7b4d642e61f..2a8783d2cb3 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -22,6 +22,8 @@
 - <a href="reporters">Reporters</a>
 - <a href="diagnostics">Diagnostics</a>
 - <a href="features">Features</a>
+- [Frequently asked questions](faq.md)
+- [System requirements](systemRequirements.md)
 - <a href="#thanks">Special thanks</a>
 
 <a id="capabilities"></a>
@@ -63,7 +65,7 @@ Commands:
 
 Starting BSL Language Server in standard mode will run the Language Server communicating via [LSP]([language server protocol](https://microsoft.github.io/language-server-protocol/)). stdin and stdout are used for communication.
 
-By default diagnostics texts are displayed in Russian. To switch the diagnostics text language you need to set parameter `diagnosticLanguage` in configuration file or raise an event `workspace/didChangeConfiguration`:
+By default diagnostics texts are displayed in Russian. To switch the diagnostics text language you need to set parameter `language` in configuration file or raise an event `workspace/didChangeConfiguration`:
 
 <a id="analyze"></a>
 
diff --git a/docs/en/systemRequirements.md b/docs/en/systemRequirements.md
new file mode 100644
index 00000000000..0658719e7d7
--- /dev/null
+++ b/docs/en/systemRequirements.md
@@ -0,0 +1 @@
+# System requirements
diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 00000000000..6e33ee8180e
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1 @@
+# Часто задаваемые вопросы
diff --git a/docs/index.md b/docs/index.md
index 647313e9d87..33c782f25c3 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -22,6 +22,8 @@
 * <a href="reporters">Репортеры</a>
 * <a href="diagnostics">Диагностики</a>
 * <a href="features">Дополнительные возможности</a>
+* [Часто задаваемые вопросы](faq.md)
+* [Системные требования](systemRequirements.md)
 * <a href="#thanks">Благодарности</a>
 
 <a id="capabilities"></a>
diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md
new file mode 100644
index 00000000000..fecdcd84e11
--- /dev/null
+++ b/docs/systemRequirements.md
@@ -0,0 +1 @@
+# Системные требования

From 2a3ad58fc37900464e886120dad8059b2d119e6e Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 15:42:04 +0300
Subject: [PATCH 297/444] test fix

---
 ...CommonModuleInvalidTypeDiagnosticTest.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
index 08c97f7cc4a..917bf8f286e 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
@@ -52,16 +52,16 @@ class CommonModuleInvalidTypeDiagnosticTest extends AbstractDiagnosticTest<Commo
   private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
 
   @Test
-  void testClientServer() {
+  void testUnknown() {
 
     getDocumentContextFromFile();
 
     // given
-    when(module.getName()).thenReturn("ПростоКлиентСервер");
+    when(module.getName()).thenReturn("СОшибкой");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isServerCall()).thenReturn(Boolean.TRUE);
-    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
-    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
@@ -76,17 +76,17 @@ void testClientServer() {
   }
 
   @Test
-  void testUnknown() {
+  void testClientServer() {
 
     getDocumentContextFromFile();
 
     // given
-    when(module.getName()).thenReturn("СОшибкой");
+    when(module.getName()).thenReturn("ПростоКлиентСервер");
     when(module.isServer()).thenReturn(Boolean.TRUE);
-    when(module.isServerCall()).thenReturn(Boolean.TRUE);
-    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
-    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
-    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
     // when
@@ -94,7 +94,6 @@ void testUnknown() {
 
     //then
     assertThat(diagnostics).hasSize(0);
-
   }
 
   @Test
@@ -149,6 +148,7 @@ void testClient() {
     // given
     when(module.getName()).thenReturn("ПростоКлиент");
     when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
     when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
     when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);

From 995ecccb448b6d9f1c0f30fb35c72cf0950d7406 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 15:50:48 +0300
Subject: [PATCH 298/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20java=20=D0=B8?=
 =?UTF-8?q?=20os?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/systemRequirements.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md
index fecdcd84e11..4ff09a1c276 100644
--- a/docs/systemRequirements.md
+++ b/docs/systemRequirements.md
@@ -1 +1,19 @@
 # Системные требования
+
+Использование `BSL Language Server` имеет ряд ограничений, ниже приведены ключевые
+
+## Поддерживаемые версии Java
+
+`BSL Language Server` представляет собой консольное Java приложение, соответственно, для его функционирования необходимо наличие виртуальной машины Java на компьютере.
+
+На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживается Java 13.
+
+Кроме версии Java интересен и вендор JDK. В связи с изменившейся политикой лицензирования Oracle, рекомендуется использование открытых реализаций виртуальной машины `OpenJDK`: AdoptOpenJDK, Liberica JDK.
+
+## Поддерживаемые операционные системы
+
+`BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных системах, для которых существует поддержка Java. В рамках сборочных ковейеров происходит тестирование наиболее популярных окружений:
+
+- гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
+- поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.
+- поддерживается MacOS последних версий

From 8ebb3e946e73d1263a88ac0b6df2a9c2304ffaeb Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 16:05:51 +0300
Subject: [PATCH 299/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D0=B0=D1=80=D1=83=20=D0=BF=D1=80=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.md                | 12 ++++++++++++
 docs/systemRequirements.md |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 6e33ee8180e..6cee76655e6 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1 +1,13 @@
 # Часто задаваемые вопросы
+
+В данном разделе собраны наиболее часто возникающие вопросы и ответы на них.
+
+1. Как изменить язык диагностических сообщений
+
+Для изменения языка выводимых сообщений с русского (по умолчанию) на английский можно с помощью конфигурационного файла. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
+
+2. Как увеличить максимальную длину строки в диагностике `Ограничение на длину строки`
+
+Все диагностики имеет страницу с описанием в разделе `Диагностики`, например интересующая [Ограничение на длину строки](diagnostics/LineLength.md). Если диагностика может менять свое поведение, то на странице с описанием будут присутствовать параметры с описанием, на что они влияют. В данном случае - параметр `maxLineLength` как раз и отвечает за максимальную длину строки.
+
+3. 
\ No newline at end of file
diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md
index 4ff09a1c276..eccd1d7df04 100644
--- a/docs/systemRequirements.md
+++ b/docs/systemRequirements.md
@@ -12,7 +12,7 @@
 
 ## Поддерживаемые операционные системы
 
-`BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных системах, для которых существует поддержка Java. В рамках сборочных ковейеров происходит тестирование наиболее популярных окружений:
+`BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных систем, для которых существует поддержка Java. В рамках сборочных ковейеров происходит тестирование наиболее популярных окружений:
 
 - гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
 - поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.

From ec6334326d391d5a7fb0683250841ba6d3c0736e Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Wed, 13 May 2020 16:26:32 +0300
Subject: [PATCH 300/444] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BE=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.md                | 11 ++++++++++-
 docs/systemRequirements.md |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 6cee76655e6..005218fe700 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -10,4 +10,13 @@
 
 Все диагностики имеет страницу с описанием в разделе `Диагностики`, например интересующая [Ограничение на длину строки](diagnostics/LineLength.md). Если диагностика может менять свое поведение, то на странице с описанием будут присутствовать параметры с описанием, на что они влияют. В данном случае - параметр `maxLineLength` как раз и отвечает за максимальную длину строки.
 
-3. 
\ No newline at end of file
+3. Как отключить Lens о когнитивной диагностики
+
+Для отключения `линзы` с информацией о когнитивной сложности стоит воспользоваться конфигурационным файлом, в котором для параметра `showCognitiveComplexity` установить значение `false`. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
+
+4. Я считаю, что диагностика работает неправильно. Что делать
+
+В случае сомнения (или уверенности) в том, что диагностика работает неверно есть два пути
+
+- обратиться в чате [telegram](https://t.me/bsl_language_server) с ситуацией, возможно все-таки ошибки нет
+- создать ишью ([issue](https://github.com/1c-syntax/bsl-language-server/issues)) в репозитории проекта соответствующего типа, куда приложить описание ошибки и, очень желательно, примеры кода, где диагностика работает неверно.
diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md
index eccd1d7df04..bf83c2fba34 100644
--- a/docs/systemRequirements.md
+++ b/docs/systemRequirements.md
@@ -6,13 +6,13 @@
 
 `BSL Language Server` представляет собой консольное Java приложение, соответственно, для его функционирования необходимо наличие виртуальной машины Java на компьютере.
 
-На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживается Java 13.
+На данный момент минимальной поддерживаемой версией является Java 11, но в рамках сборочных конвейеров происходит проверка работоспособности при использовании более свежих версий. На данный момент поддерживаются Java версий 11, 13 и 14.
 
 Кроме версии Java интересен и вендор JDK. В связи с изменившейся политикой лицензирования Oracle, рекомендуется использование открытых реализаций виртуальной машины `OpenJDK`: AdoptOpenJDK, Liberica JDK.
 
 ## Поддерживаемые операционные системы
 
-`BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных систем, для которых существует поддержка Java. В рамках сборочных ковейеров происходит тестирование наиболее популярных окружений:
+`BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных систем, для которых существует поддержка Java. В рамках сборочных конвейеров происходит тестирование наиболее популярных окружений:
 
 - гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
 - поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.

From a2a0e83f705178bce3e3031c0fb046c3545a3e2c Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 17:09:53 +0300
Subject: [PATCH 301/444] type in abstract class

---
 .../AbstractCommonModuleNameDiagnostic.java   | 32 +++++++++++++++++++
 .../CommonModuleInvalidTypeDiagnostic.java    | 32 -------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 6645e15b907..58cf77773a6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -61,4 +61,36 @@ protected boolean matchCheck(Matcher matcher) {
     return !matcher.find();
   }
 
+  protected static boolean isClientServer(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && commonModule.isServer()
+      && commonModule.isExternalConnection()
+//      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientManagedApplication();
+  }
+
+  protected static boolean isClient(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && !commonModule.isServer()
+      && !commonModule.isExternalConnection()
+//      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientManagedApplication();
+  }
+
+  protected static boolean isServerCall(CommonModule commonModule) {
+    return commonModule.isServerCall()
+      && commonModule.isServer()
+      && !commonModule.isExternalConnection()
+//      && !commonModule.isClientOrdinaryApplication()
+      && !commonModule.isClientManagedApplication();
+  }
+
+  protected static boolean isServer(CommonModule commonModule) {
+    return !commonModule.isServerCall()
+      && commonModule.isServer()
+      && commonModule.isExternalConnection()
+//      && commonModule.isClientOrdinaryApplication()
+      && !commonModule.isClientManagedApplication();
+  }
+
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
index 834d4586a7b..4c024bbf128 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnostic.java
@@ -61,38 +61,6 @@ protected boolean flagsCheck(CommonModule commonModule) {
       && !isClientServer(commonModule);
   }
 
-  private boolean isClientServer(CommonModule commonModule) {
-    return !commonModule.isServerCall()
-      && commonModule.isServer()
-      && commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
-      && commonModule.isClientManagedApplication();
-  }
-
-  private boolean isClient(CommonModule commonModule) {
-    return !commonModule.isServerCall()
-      && !commonModule.isServer()
-      && !commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
-      && commonModule.isClientManagedApplication();
-  }
-
-  private boolean isServerCall(CommonModule commonModule) {
-    return commonModule.isServerCall()
-      && commonModule.isServer()
-      && !commonModule.isExternalConnection()
-      && !commonModule.isClientOrdinaryApplication()
-      && !commonModule.isClientManagedApplication();
-  }
-
-  private boolean isServer(CommonModule commonModule) {
-    return !commonModule.isServerCall()
-      && commonModule.isServer()
-      && commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
-      && !commonModule.isClientManagedApplication();
-  }
-
   @Override
   protected boolean matchCheck(Matcher matcher) {
     return true;

From 4bb5c5ec16109e628ef8aceaaab9d20650966c4c Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 17:11:15 +0300
Subject: [PATCH 302/444] other diags use abstract type

---
 .../CommonModuleNameClientDiagnostic.java     |  3 +--
 ...ommonModuleNameClientServerDiagnostic.java |  2 +-
 ...ommonModuleNameGlobalClientDiagnostic.java |  2 +-
 .../CommonModuleNameServerCallDiagnostic.java |  2 +-
 .../CommonModuleNameClientDiagnosticTest.java | 20 +++++++++++++++++++
 ...nModuleNameClientServerDiagnosticTest.java |  1 +
 ...nModuleNameGlobalClientDiagnosticTest.java |  4 ++++
 ...monModuleNameServerCallDiagnosticTest.java |  2 +-
 8 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
index 4583ccf34d3..dd888de3c28 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnostic.java
@@ -55,8 +55,7 @@ public CommonModuleNameClientDiagnostic(DiagnosticInfo info) {
   @Override
   protected boolean flagsCheck(CommonModule commonModule) {
     return !commonModule.isGlobal()
-      && commonModule.isClientManagedApplication()
-      && !commonModule.isServerCall();
+      && isClient(commonModule);
   }
 
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
index 9bf906774b5..a0afab1ac81 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnostic.java
@@ -54,6 +54,6 @@ public CommonModuleNameClientServerDiagnostic(DiagnosticInfo info) {
 
   @Override
   protected boolean flagsCheck(CommonModule commonModule) {
-    return commonModule.isServer() && commonModule.isClientManagedApplication();
+    return isClientServer(commonModule);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
index a3418f144c3..bd919182260 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnostic.java
@@ -52,6 +52,6 @@ public CommonModuleNameGlobalClientDiagnostic(DiagnosticInfo info) {
 
   @Override
   protected boolean flagsCheck(CommonModule commonModule) {
-    return commonModule.isGlobal() && commonModule.isClientManagedApplication();
+    return commonModule.isGlobal() && isClient(commonModule);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
index 8b4af0d9dcc..e4e19a93546 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnostic.java
@@ -54,6 +54,6 @@ public CommonModuleNameServerCallDiagnostic(DiagnosticInfo info) {
 
   @Override
   protected boolean flagsCheck(CommonModule commonModule) {
-    return commonModule.isServer() && commonModule.isServerCall();
+    return isServerCall(commonModule);
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
index ef4511bc442..a5817c271b6 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -74,6 +74,26 @@ void test() {
 
   }
 
+  @Test
+  void testClientServer() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
   @Test
   void testNegative() {
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 2adfde03167..e0a12944271 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -61,6 +61,7 @@ void test() {
     when(module.getName()).thenReturn("ЧтоТо");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index eb4980d0cd5..de21b6c0bbe 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -61,6 +61,8 @@ void test() {
     when(module.getName()).thenReturn("ЧтоТоКлиентГлобальный");
     when(module.isGlobal()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+    when(module.isServer()).thenReturn(Boolean.FALSE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
@@ -83,6 +85,8 @@ void testEng() {
     when(module.getName()).thenReturn("ЧтоТоClientGlobal");
     when(module.isGlobal()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+    when(module.isServer()).thenReturn(Boolean.FALSE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
index eef9a811986..87c81347b70 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -60,7 +60,7 @@ void test() {
     // given
     when(module.getName()).thenReturn("ЧтоТо");
     when(module.isServer()).thenReturn(Boolean.TRUE);
-    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
     when(module.isServerCall()).thenReturn(Boolean.TRUE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));

From 8907137dae159a7ca45f616e886c31ebcda566ec Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 13 May 2020 17:20:12 +0300
Subject: [PATCH 303/444] Update gradle.yml

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index dbb6080d29e..1a739d31b8a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '13']
+        java_version: ['11', '14']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v1

From 5e969f4d6c41cd44a0e6fbd39ecc2ec57bce32e5 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 18:20:31 +0300
Subject: [PATCH 304/444] isClientOrdinaryApplication

---
 .../diagnostics/AbstractCommonModuleNameDiagnostic.java   | 8 ++++----
 .../diagnostics/CommonModuleNameClientDiagnosticTest.java | 1 +
 .../CommonModuleNameClientServerDiagnosticTest.java       | 1 +
 .../CommonModuleNameGlobalClientDiagnosticTest.java       | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 58cf77773a6..1dc0b0a7081 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -65,7 +65,7 @@ protected static boolean isClientServer(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && commonModule.isServer()
       && commonModule.isExternalConnection()
-//      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientOrdinaryApplication()
       && commonModule.isClientManagedApplication();
   }
 
@@ -73,7 +73,7 @@ protected static boolean isClient(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && !commonModule.isServer()
       && !commonModule.isExternalConnection()
-//      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientOrdinaryApplication()
       && commonModule.isClientManagedApplication();
   }
 
@@ -81,7 +81,7 @@ protected static boolean isServerCall(CommonModule commonModule) {
     return commonModule.isServerCall()
       && commonModule.isServer()
       && !commonModule.isExternalConnection()
-//      && !commonModule.isClientOrdinaryApplication()
+      && !commonModule.isClientOrdinaryApplication()
       && !commonModule.isClientManagedApplication();
   }
 
@@ -89,7 +89,7 @@ protected static boolean isServer(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && commonModule.isServer()
       && commonModule.isExternalConnection()
-//      && commonModule.isClientOrdinaryApplication()
+      && commonModule.isClientOrdinaryApplication()
       && !commonModule.isClientManagedApplication();
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
index a5817c271b6..3cdb88e9a4d 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -61,6 +61,7 @@ void test() {
     when(module.getName()).thenReturn("ЧтоТо");
     when(module.isServer()).thenReturn(Boolean.FALSE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index e0a12944271..355ffe445b3 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -61,6 +61,7 @@ void test() {
     when(module.getName()).thenReturn("ЧтоТо");
     when(module.isServer()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
     when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
 
     when(documentContext.getMdObject()).thenReturn(Optional.of(module));
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index de21b6c0bbe..45bff436bd7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -61,6 +61,7 @@ void test() {
     when(module.getName()).thenReturn("ЧтоТоКлиентГлобальный");
     when(module.isGlobal()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
     when(module.isServerCall()).thenReturn(Boolean.FALSE);
     when(module.isServer()).thenReturn(Boolean.FALSE);
 
@@ -85,6 +86,7 @@ void testEng() {
     when(module.getName()).thenReturn("ЧтоТоClientGlobal");
     when(module.isGlobal()).thenReturn(Boolean.TRUE);
     when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
     when(module.isServerCall()).thenReturn(Boolean.FALSE);
     when(module.isServer()).thenReturn(Boolean.FALSE);
 

From 73e094b3592c43cdadf55a22999041a05656a7c9 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Wed, 13 May 2020 22:41:16 +0300
Subject: [PATCH 305/444] =?UTF-8?q?=D0=9D=D0=B5=D0=BE=D0=B1=D1=8F=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?isClientOrdinaryApplication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCommonModuleNameDiagnostic.java   | 16 ++++---
 .../CommonModuleNameClientDiagnosticTest.java | 25 ++++++++++
 ...nModuleNameClientServerDiagnosticTest.java | 25 ++++++++++
 ...monModuleNameServerCallDiagnosticTest.java | 46 +++++++++++++++++++
 4 files changed, 105 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 1dc0b0a7081..25616ecf4bb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -65,32 +65,34 @@ protected static boolean isClientServer(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && commonModule.isServer()
       && commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
-      && commonModule.isClientManagedApplication();
+      && isClientApplication(commonModule);
   }
 
   protected static boolean isClient(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && !commonModule.isServer()
       && !commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
-      && commonModule.isClientManagedApplication();
+      && isClientApplication(commonModule);
   }
 
   protected static boolean isServerCall(CommonModule commonModule) {
     return commonModule.isServerCall()
       && commonModule.isServer()
       && !commonModule.isExternalConnection()
-      && !commonModule.isClientOrdinaryApplication()
-      && !commonModule.isClientManagedApplication();
+      && !isClientApplication(commonModule);
   }
 
   protected static boolean isServer(CommonModule commonModule) {
     return !commonModule.isServerCall()
       && commonModule.isServer()
       && commonModule.isExternalConnection()
-      && commonModule.isClientOrdinaryApplication()
+//      && commonModule.isClientOrdinaryApplication()
       && !commonModule.isClientManagedApplication();
   }
 
+  private static boolean isClientApplication(CommonModule commonModule) {
+    return commonModule.isClientOrdinaryApplication()
+      || commonModule.isClientManagedApplication();
+  }
+
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
index 3cdb88e9a4d..10830940b8a 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -75,6 +75,31 @@ void test() {
 
   }
 
+  @Test
+  void testClient() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
   @Test
   void testClientServer() {
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index 355ffe445b3..f1223265d43 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -76,6 +76,31 @@ void test() {
 
   }
 
+  @Test
+  void testClientServer() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isClientManagedApplication()).thenReturn(Boolean.TRUE);
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(5, 0, 1);
+
+  }
+
   @Test
   void testNegative() {
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
index 87c81347b70..6f78d4ff091 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -75,6 +75,52 @@ void test() {
 
   }
 
+  @Test
+  void testServer() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.FALSE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(0);
+
+  }
+
+  @Test
+  void testServerCall() {
+
+    getDocumentContextFromFile();
+
+    // given
+    when(module.getName()).thenReturn("ЧтоТо");
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isServerCall()).thenReturn(Boolean.TRUE);
+
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    // when
+    List<Diagnostic> diagnostics = diagnosticInstance.getDiagnostics(documentContext);
+
+    //then
+    assertThat(diagnostics).hasSize(1);
+
+  }
+
   @Test
   void TestNegative() {
 

From 4216938269de79bb1aae542fffc1de17125ec6a2 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 08:52:24 +0300
Subject: [PATCH 306/444] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 005218fe700..5b75b194307 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -2,21 +2,27 @@
 
 В данном разделе собраны наиболее часто возникающие вопросы и ответы на них.
 
-1. Как изменить язык диагностических сообщений
+1. Как изменить язык диагностических сообщений?
 
 Для изменения языка выводимых сообщений с русского (по умолчанию) на английский можно с помощью конфигурационного файла. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
 
-2. Как увеличить максимальную длину строки в диагностике `Ограничение на длину строки`
+2. Как увеличить максимальную длину строки в диагностике `Ограничение на длину строки`?
 
 Все диагностики имеет страницу с описанием в разделе `Диагностики`, например интересующая [Ограничение на длину строки](diagnostics/LineLength.md). Если диагностика может менять свое поведение, то на странице с описанием будут присутствовать параметры с описанием, на что они влияют. В данном случае - параметр `maxLineLength` как раз и отвечает за максимальную длину строки.
 
-3. Как отключить Lens о когнитивной диагностики
+3. Как отключить Lens о когнитивной диагностики?
 
 Для отключения `линзы` с информацией о когнитивной сложности стоит воспользоваться конфигурационным файлом, в котором для параметра `showCognitiveComplexity` установить значение `false`. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
 
-4. Я считаю, что диагностика работает неправильно. Что делать
+4. Я считаю, что диагностика работает неправильно. Что делать?
 
 В случае сомнения (или уверенности) в том, что диагностика работает неверно есть два пути
 
 - обратиться в чате [telegram](https://t.me/bsl_language_server) с ситуацией, возможно все-таки ошибки нет
 - создать ишью ([issue](https://github.com/1c-syntax/bsl-language-server/issues)) в репозитории проекта соответствующего типа, куда приложить описание ошибки и, очень желательно, примеры кода, где диагностика работает неверно.
+
+5. `BSL Language Server` и SonarQube плагин это одно и тоже?
+
+`BSL Language Server` является самостоятельным приложением, реализацией серверной части протокола LSP. Плагин для SonarQube использует `BSL Language Server` для выполнения анализа исходного кода языка BSL (конфигурации 1С, скрипты 1Scipt и OSWeb).
+
+`BSL Language Server` может быть использован с любым приложением, имеющим реализацию LSP клиента, на данный момент это плагины для [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/), [1C:Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (собственная реализация, без LSP), плагин для [SonarQube](https://github.com/1c-syntax/sonar-bsl-plugin-community), [Phoenix BSL](https://github.com/otymko/phoenixbsl)

From bc118c2d7aac45c5ac92edcefe5d1c83c1cf9b1d Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 09:56:34 +0300
Subject: [PATCH 307/444] #566
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Диагностики UsingModalWindows и UsingSynchronousCalls стали использовать соответствующие флаги
---
 docs/diagnostics/UsingModalWindows.md         |  2 +-
 docs/diagnostics/UsingSynchronousCalls.md     |  2 +-
 docs/diagnostics/index.md                     |  4 +-
 docs/en/diagnostics/UsingModalWindows.md      |  2 +-
 docs/en/diagnostics/UsingSynchronousCalls.md  |  2 +-
 docs/en/diagnostics/index.md                  |  4 +-
 .../UsingModalWindowsDiagnostic.java          | 13 +++++-
 .../UsingSynchronousCallsDiagnostic.java      | 13 +++++-
 .../configuration/parameters-schema.json      |  6 +--
 .../UsingModalWindowsDiagnosticTest.java      | 41 ++++++++++++++++++-
 .../UsingSynchronousCallsDiagnosticTest.java  | 41 ++++++++++++++++++-
 11 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/docs/diagnostics/UsingModalWindows.md b/docs/diagnostics/UsingModalWindows.md
index 31b9631f038..5a55f7e351c 100644
--- a/docs/diagnostics/UsingModalWindows.md
+++ b/docs/diagnostics/UsingModalWindows.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL` | `Важный` | `Нет` | `15` | `standard` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `15` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/UsingSynchronousCalls.md b/docs/diagnostics/UsingSynchronousCalls.md
index e62a9a4007d..746f13e692e 100644
--- a/docs/diagnostics/UsingSynchronousCalls.md
+++ b/docs/diagnostics/UsingSynchronousCalls.md
@@ -2,7 +2,7 @@
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Дефект кода` | `BSL` | `Важный` | `Нет` | `15` | `standard` |
+| `Дефект кода` | `BSL` | `Важный` | `Да` | `15` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index ad208c20421..a3dcc1c89c6 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -117,10 +117,10 @@
 | [UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Хранение ip-адресов в коде | Да | Критичный | Уязвимость | `standard` |
 | [UsingHardcodePath](UsingHardcodePath.md) | Хранение путей к файлам в коде | Да | Критичный | Ошибка | `standard` |
 | [UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Хранение конфиденциальной информации в коде | Да | Критичный | Уязвимость | `standard` |
-| [UsingModalWindows](UsingModalWindows.md) | Использование модальных окон | Нет | Важный | Дефект кода | `standard` |
+| [UsingModalWindows](UsingModalWindows.md) | Использование модальных окон | Да | Важный | Дефект кода | `standard` |
 | [UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Использование объектов недоступных в Unix системах | Да | Критичный | Ошибка | `standard`<br/>`lockinos` |
 | [UsingServiceTag](UsingServiceTag.md) | Использование служебных тегов | Да | Информационный | Дефект кода | `badpractice` |
-| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Использование синхронных вызовов | Нет | Важный | Дефект кода | `standard` |
+| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Использование синхронных вызовов | Да | Важный | Дефект кода | `standard` |
 | [UsingThisForm](UsingThisForm.md) | Использование устаревшего свойства "ЭтаФорма" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
 | [WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Некорректное использование метода ОтменитьТранзакцию() | Да | Критичный | Ошибка | `standard` |
 | [YoLetterUsage](YoLetterUsage.md) | Использование буквы "ё" в текстах модулей | Да | Информационный | Дефект кода | `standard` |
\ No newline at end of file
diff --git a/docs/en/diagnostics/UsingModalWindows.md b/docs/en/diagnostics/UsingModalWindows.md
index 4cce7608c10..35343337293 100644
--- a/docs/en/diagnostics/UsingModalWindows.md
+++ b/docs/en/diagnostics/UsingModalWindows.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `No` | `15` | `standard` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `15` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/UsingSynchronousCalls.md b/docs/en/diagnostics/UsingSynchronousCalls.md
index fa7d3f40018..b188c7e3f51 100644
--- a/docs/en/diagnostics/UsingSynchronousCalls.md
+++ b/docs/en/diagnostics/UsingSynchronousCalls.md
@@ -2,7 +2,7 @@
 
 | Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
 | :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `No` | `15` | `standard` |
+| `Code smell` | `BSL` | `Major` | `Yes` | `15` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 1ab3ba79e4e..8a8975e2b02 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -117,10 +117,10 @@ Total: **107**
 | [UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Using hardcode ip addresses in code | Yes | Critical | Vulnerability | `standard` |
 | [UsingHardcodePath](UsingHardcodePath.md) | Using hardcode file paths in code | Yes | Critical | Error | `standard` |
 | [UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Storing confidential information in code | Yes | Critical | Vulnerability | `standard` |
-| [UsingModalWindows](UsingModalWindows.md) | Using modal windows | No | Major | Code smell | `standard` |
+| [UsingModalWindows](UsingModalWindows.md) | Using modal windows | Yes | Major | Code smell | `standard` |
 | [UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Using unavailable in Unix objects | Yes | Critical | Error | `standard`<br/>`lockinos` |
 | [UsingServiceTag](UsingServiceTag.md) | Using service tags | Yes | Info | Code smell | `badpractice` |
-| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | No | Major | Code smell | `standard` |
+| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | Yes | Major | Code smell | `standard` |
 | [UsingThisForm](UsingThisForm.md) | Using deprecated property "ThisForm" | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
 | [WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Not recommended using of RollbackTransaction method | Yes | Critical | Error | `standard` |
 | [YoLetterUsage](YoLetterUsage.md) | Using Russian character "yo" ("ё") in code | Yes | Info | Code smell | `standard` |
\ No newline at end of file
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
index ebc25f7e5e2..ace9daa0e4e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
 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.DiagnosticScope;
@@ -28,6 +29,7 @@
 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.mdclasses.metadata.additional.UseMode;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
@@ -39,10 +41,10 @@
   severity = DiagnosticSeverity.MAJOR,
   scope = DiagnosticScope.BSL,
   minutesToFix = 15,
-  activatedByDefault = false,
   tags = {
     DiagnosticTag.STANDARD
-  }
+  },
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_3
 )
 public class UsingModalWindowsDiagnostic extends AbstractVisitorDiagnostic {
 
@@ -86,6 +88,13 @@ public UsingModalWindowsDiagnostic(DiagnosticInfo info) {
 
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    var configuration = documentContext.getServerContext().getConfiguration();
+    // если использование модальных окон разрешено (без предупреждение), то
+    // ничего не диагностируется
+    if (configuration.getModalityUseMode() == UseMode.USE) {
+      return ctx;
+    }
+
     String methodName = ctx.methodName().getText();
     if (modalityMethods.matcher(methodName).matches()) {
       diagnosticStorage.addDiagnostic(ctx,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
index 76dd40a94f0..e7645bc2f4e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
 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.DiagnosticScope;
@@ -29,6 +30,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
@@ -40,10 +42,10 @@
   severity = DiagnosticSeverity.MAJOR,
   scope = DiagnosticScope.BSL,
   minutesToFix = 15,
-  activatedByDefault = false,
   tags = {
     DiagnosticTag.STANDARD
-  }
+  },
+  compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_3
 )
 public class UsingSynchronousCallsDiagnostic extends AbstractVisitorDiagnostic {
   private static final Pattern MODALITY_METHODS = Pattern.compile(
@@ -124,6 +126,13 @@ public UsingSynchronousCallsDiagnostic(DiagnosticInfo info) {
 
   @Override
   public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    var configuration = documentContext.getServerContext().getConfiguration();
+    // если использование синхронных вызовов разрешено (без предупреждение), то
+    // ничего не диагностируется
+    if (configuration.getSynchronousExtensionAndAddInCallUseMode() == UseMode.USE) {
+      return ctx;
+    }
+
     String methodName = ctx.methodName().getText();
     if (MODALITY_METHODS.matcher(methodName).matches()) {
       BSLParser.SubContext rootParent = (BSLParser.SubContext) Trees.getRootParent(ctx, BSLParser.RULE_sub);
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 f54eec0b8d4..eb2089cc696 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
@@ -197,7 +197,7 @@
             "properties": {
                 "words": {
                     "description": "Unrecommended words",
-                    "default": "",
+                    "default": "\u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b|procedures|\u0444\u0443\u043d\u043a\u0446\u0438\u0438|functions|\u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438|handlers|\u043c\u043e\u0434\u0443\u043b\u044c|module|\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u044c|functionality",
                     "type": "string",
                     "title": "Unrecommended words"
                 }
@@ -1292,7 +1292,7 @@
         },
         "UsingModalWindows": {
             "description": "Using modal windows",
-            "default": false,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
@@ -1330,7 +1330,7 @@
         },
         "UsingSynchronousCalls": {
             "description": "Using synchronous calls",
-            "default": false,
+            "default": true,
             "type": [
                 "boolean",
                 "object"
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnosticTest.java
index 40445f36f52..683755ad385 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnosticTest.java
@@ -21,22 +21,34 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
+import com.github._1c_syntax.utils.Absolute;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
+import java.nio.file.Paths;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 class UsingModalWindowsDiagnosticTest extends AbstractDiagnosticTest<UsingModalWindowsDiagnostic> {
   UsingModalWindowsDiagnosticTest() {
     super(UsingModalWindowsDiagnostic.class);
   }
 
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
   @Test
-  void test() {
-    List<Diagnostic> diagnostics = getDiagnostics();
+  void testDontUse() {
+
+    var documentContext = getDocumentContextWithUseFlag(UseMode.DONT_USE);
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
 
     assertThat(diagnostics).hasSize(12);
     assertThat(diagnostics)
@@ -65,5 +77,30 @@ void test() {
       .anyMatch(diagnostic -> diagnostic.getRange().equals(Ranges.create(186, 4, 186, 88))
         && diagnostic.getMessage().matches(".*(модального|modal).*ПоместитьФайл.*НачатьПомещениеФайла.*"));
   }
+
+  @Test
+  void testUse() {
+
+    DocumentContext documentContext = getDocumentContextWithUseFlag(UseMode.USE);
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+    assertThat(diagnostics).hasSize(0);
+  }
+
+  private DocumentContext getDocumentContextWithUseFlag(UseMode useMode) {
+    var path = Absolute.path(PATH_TO_METADATA);
+    var testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    var serverContext = spy(new ServerContext(path));
+    var configuration = spy(serverContext.getConfiguration());
+    when(configuration.getModalityUseMode()).thenReturn(useMode);
+    when(serverContext.getConfiguration()).thenReturn(configuration);
+
+    return new DocumentContext(
+      testFile.toUri(),
+      getText(),
+      serverContext
+    );
+  }
+
 }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnosticTest.java
index 2096fa3d0d7..f14aa789dcf 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnosticTest.java
@@ -21,22 +21,34 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
+import com.github._1c_syntax.utils.Absolute;
 import org.eclipse.lsp4j.Diagnostic;
 import org.junit.jupiter.api.Test;
 
+import java.nio.file.Paths;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 class UsingSynchronousCallsDiagnosticTest extends AbstractDiagnosticTest<UsingSynchronousCallsDiagnostic> {
   UsingSynchronousCallsDiagnosticTest() {
     super(UsingSynchronousCallsDiagnostic.class);
   }
 
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
   @Test
-  void test() {
-    List<Diagnostic> diagnostics = getDiagnostics();
+  void testDontUse() {
+
+    var documentContext = getDocumentContextWithUseFlag(UseMode.DONT_USE);
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
 
     assertThat(diagnostics).hasSize(28);
     assertThat(diagnostics)
@@ -97,4 +109,29 @@ void test() {
       .anyMatch(diagnostic -> diagnostic.getRange().equals(Ranges.create(391, 4, 391, 38))
         && diagnostic.getMessage().matches(".*(синхронного|synchronous).*ЗапуститьПриложение.*НачатьЗапускПриложения.*"));
   }
+
+  @Test
+  void testUse() {
+
+    DocumentContext documentContext = getDocumentContextWithUseFlag(UseMode.USE);
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+    assertThat(diagnostics).hasSize(0);
+  }
+
+  private DocumentContext getDocumentContextWithUseFlag(UseMode useMode) {
+    var path = Absolute.path(PATH_TO_METADATA);
+    var testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    var serverContext = spy(new ServerContext(path));
+    var configuration = spy(serverContext.getConfiguration());
+    when(configuration.getSynchronousExtensionAndAddInCallUseMode()).thenReturn(useMode);
+    when(serverContext.getConfiguration()).thenReturn(configuration);
+
+    return new DocumentContext(
+      testFile.toUri(),
+      getText(),
+      serverContext
+    );
+  }
+
 }

From 9837bd2a0856c86c62161db75239fbb15ea1c447 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 12:47:53 +0300
Subject: [PATCH 308/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=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=BD=D0=B0=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D1=8F=D0=B5=D0=BC=D1=8B=D0=B9=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/ExecuteExternalCode.md       | 43 +++++++++
 .../ExecuteExternalCodeInCommonModule.md      | 43 +++++++++
 docs/diagnostics/index.md                     |  6 +-
 docs/en/diagnostics/ExecuteExternalCode.md    | 36 +++++++
 .../ExecuteExternalCodeInCommonModule.md      | 36 +++++++
 docs/en/diagnostics/index.md                  |  6 +-
 ...AbstractExecuteExternalCodeDiagnostic.java | 57 +++++++++++
 .../ExecuteExternalCodeDiagnostic.java        | 87 +++++++++++++++++
 ...eExternalCodeInCommonModuleDiagnostic.java | 68 +++++++++++++
 .../bsl/languageserver/utils/Keywords.java    |  2 +
 .../configuration/parameters-schema.json      | 20 ++++
 .../languageserver/configuration/schema.json  |  6 ++
 ...xecuteExternalCodeDiagnostic_en.properties |  2 +
 ...xecuteExternalCodeDiagnostic_ru.properties |  2 +
 ...CodeInCommonModuleDiagnostic_en.properties |  2 +
 ...CodeInCommonModuleDiagnostic_ru.properties |  2 +
 .../ExecuteExternalCodeDiagnosticTest.java    | 51 ++++++++++
 ...ernalCodeInCommonModuleDiagnosticTest.java | 96 +++++++++++++++++++
 .../ExecuteExternalCodeDiagnostic.bsl         | 33 +++++++
 ...teExternalCodeInCommonModuleDiagnostic.bsl | 12 +++
 20 files changed, 606 insertions(+), 4 deletions(-)
 create mode 100644 docs/diagnostics/ExecuteExternalCode.md
 create mode 100644 docs/diagnostics/ExecuteExternalCodeInCommonModule.md
 create mode 100644 docs/en/diagnostics/ExecuteExternalCode.md
 create mode 100644 docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractExecuteExternalCodeDiagnostic.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_ru.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnosticTest.java
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
 create mode 100644 src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl

diff --git a/docs/diagnostics/ExecuteExternalCode.md b/docs/diagnostics/ExecuteExternalCode.md
new file mode 100644
index 00000000000..c68e6c22604
--- /dev/null
+++ b/docs/diagnostics/ExecuteExternalCode.md
@@ -0,0 +1,43 @@
+# Выполнение произвольного кода на сервере (ExecuteExternalCode)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Уязвимость` | `BSL` | `Критичный` | `Да` | `1` | `error`<br/>`standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.  
+Запрещено использование методов `Выполнить` и `Вычислить` в серверных методах модулей форм, команд, объектов и т.д. 
+
+**Ограничение не распространяется на код, выполняемый на клиенте.**
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* [Ограничения на использование Выполнить и Вычислить на сервере](https://its.1c.ru/db/v8std#content:770:hdoc)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:ExecuteExternalCode-off
+// BSLLS:ExecuteExternalCode-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"ExecuteExternalCode": false
+```
diff --git a/docs/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/diagnostics/ExecuteExternalCodeInCommonModule.md
new file mode 100644
index 00000000000..23d931e886f
--- /dev/null
+++ b/docs/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -0,0 +1,43 @@
+# Выполнение произвольного кода в общем модуле на сервере (ExecuteExternalCodeInCommonModule)
+
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Потенциальная уязвимость` | `BSL` | `Критичный` | `Да` | `15` | `badpractice`<br/>`standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.  
+Если выполнение произвольного кода необходимо, то такой код должен предварительно располагаться в общем модуле и пройти аудит.
+
+**Ограничение не распространяется на код, выполняемый на клиенте.**
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+* [Ограничения на использование Выполнить и Вычислить на сервере](https://its.1c.ru/db/v8std#content:770:hdoc)
+
+## Сниппеты
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Экранирование кода
+
+```bsl
+// BSLLS:ExecuteExternalCodeInCommonModule-off
+// BSLLS:ExecuteExternalCodeInCommonModule-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"ExecuteExternalCodeInCommonModule": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 1f8526ece6e..a653372432c 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -11,9 +11,9 @@
 Общее количество: **108**
 
 * Дефект кода: **69**
-* Уязвимость: **2**
+* Уязвимость: **3**
 * Ошибка: **34**
-* Потенциальная уязвимость: **3**
+* Потенциальная уязвимость: **4**
 
 | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги |
 | --- | --- | :-: | --- | --- | --- |
@@ -54,6 +54,8 @@
 | [EmptyRegion](EmptyRegion.md) | Область не должна быть пустой | Да | Информационный | Дефект кода | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Пустой оператор | Да | Информационный | Дефект кода | `badpractice` |
 | [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Избыточная проверка параметра АвтоТест | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
+| [ExecuteExternalCode](ExecuteExternalCode.md) | Выполнение произвольного кода на сервере | Да | Критичный | Уязвимость | `error`<br/>`standard` |
+| [ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Выполнение произвольного кода в общем модуле на сервере | Да | Критичный | Потенциальная уязвимость | `badpractice`<br/>`standard` |
 | [ExtraCommas](ExtraCommas.md) | Запятые без указания параметра в конце вызова метода | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | Использование метода ДанныеФормыВЗначение | Да | Информационный | Дефект кода | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Имя функции не должно начинаться с "Получить" | Нет | Информационный | Дефект кода | `standard` |
diff --git a/docs/en/diagnostics/ExecuteExternalCode.md b/docs/en/diagnostics/ExecuteExternalCode.md
new file mode 100644
index 00000000000..678a7df908b
--- /dev/null
+++ b/docs/en/diagnostics/ExecuteExternalCode.md
@@ -0,0 +1,36 @@
+# Executing of external code on the server (ExecuteExternalCode)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Vulnerability` | `BSL` | `Critical` | `Yes` | `1` | `error`<br/>`standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:ExecuteExternalCode-off
+// BSLLS:ExecuteExternalCode-on
+```
+
+### Parameter for config
+
+```json
+"ExecuteExternalCode": false
+```
diff --git a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
new file mode 100644
index 00000000000..e70751a4e9a
--- /dev/null
+++ b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -0,0 +1,36 @@
+# Executing of external code in a common module on the server (ExecuteExternalCodeInCommonModule)
+
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `badpractice`<br/>`standard` |
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:ExecuteExternalCodeInCommonModule-off
+// BSLLS:ExecuteExternalCodeInCommonModule-on
+```
+
+### Parameter for config
+
+```json
+"ExecuteExternalCodeInCommonModule": false
+```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 3db8aec78ff..0ceefdfe898 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -12,8 +12,8 @@ Total: **108**
 
 * Error: **34**
 * Code smell: **69**
-* Vulnerability: **2**
-* Security Hotspot: **3**
+* Vulnerability: **3**
+* Security Hotspot: **4**
 
 | Key | Name| Enabled by default | Severity | Type | Tags |
 | --- | --- | :-: | --- | --- | --- |
@@ -54,6 +54,8 @@ Total: **108**
 | [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
 | [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
 | [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [ExecuteExternalCode](ExecuteExternalCode.md) | Executing of external code on the server | Yes | Critical | Vulnerability | `error`<br/>`standard` |
+| [ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Executing of external code in a common module on the server | Yes | Critical | Security Hotspot | `badpractice`<br/>`standard` |
 | [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
 | [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
 | [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractExecuteExternalCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractExecuteExternalCodeDiagnostic.java
new file mode 100644
index 00000000000..d7da12a239e
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractExecuteExternalCodeDiagnostic.java
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
+import com.github._1c_syntax.bsl.languageserver.utils.Keywords;
+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.Optional;
+import java.util.regex.Pattern;
+
+abstract class AbstractExecuteExternalCodeDiagnostic extends AbstractVisitorDiagnostic {
+
+  private static final Pattern EVAL_METHOD_NAME = CaseInsensitivePattern.compile(
+    String.format("^(%s|%s)$", Keywords.EVAL_EN, Keywords.EVAL_RU));
+
+  public AbstractExecuteExternalCodeDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitExecuteStatement(BSLParser.ExecuteStatementContext ctx) {
+    diagnosticStorage.addDiagnostic(ctx);
+    return super.visitExecuteStatement(ctx);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    Optional.of(ctx)
+      .filter(it -> EVAL_METHOD_NAME.matcher(it.methodName().getText()).matches())
+      .ifPresent(diagnosticStorage::addDiagnostic);
+
+    return super.visitGlobalMethodCall(ctx);
+  }
+
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic.java
new file mode 100644
index 00000000000..a7686c23de9
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic.java
@@ -0,0 +1,87 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.DiagnosticScope;
+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.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.VULNERABILITY,
+  severity = DiagnosticSeverity.CRITICAL,
+  minutesToFix = 1,
+  scope = DiagnosticScope.BSL,
+  tags = {
+    DiagnosticTag.ERROR,
+    DiagnosticTag.STANDARD
+  },
+  modules = {
+    ModuleType.CommandModule,
+    ModuleType.ExternalConnectionModule,
+    ModuleType.FormModule,
+    ModuleType.HTTPServiceModule,
+    ModuleType.ObjectModule,
+    ModuleType.OrdinaryApplicationModule,
+    ModuleType.RecordSetModule,
+    ModuleType.ValueManagerModule,
+    ModuleType.WEBServiceModule,
+    ModuleType.SessionModule
+  }
+)
+public class ExecuteExternalCodeDiagnostic extends AbstractExecuteExternalCodeDiagnostic {
+
+  public ExecuteExternalCodeDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
+
+    // если только клиентская аннотация, тогда ничего не делаем
+    if (ctx.funcDeclaration().compilerDirective().stream()
+      .anyMatch(compilerDirectiveContext
+        -> compilerDirectiveContext.getStop().getType() == BSLParser.ANNOTATION_ATCLIENT_SYMBOL)) {
+      return ctx;
+    }
+
+    return super.visitFunction(ctx);
+  }
+
+  @Override
+  public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
+
+    // если только клиентская аннотация, тогда ничего не делаем
+    if (ctx.procDeclaration().compilerDirective().stream()
+      .anyMatch(compilerDirectiveContext
+        -> compilerDirectiveContext.getStop().getType() == BSLParser.ANNOTATION_ATCLIENT_SYMBOL)) {
+      return ctx;
+    }
+
+    return super.visitProcedure(ctx);
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.java
new file mode 100644
index 00000000000..bb80c0568ef
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.java
@@ -0,0 +1,68 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.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.DiagnosticScope;
+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.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.SECURITY_HOTSPOT,
+  severity = DiagnosticSeverity.CRITICAL,
+  minutesToFix = 15,
+  scope = DiagnosticScope.BSL,
+  tags = {
+    DiagnosticTag.BADPRACTICE,
+    DiagnosticTag.STANDARD
+  },
+  modules = {
+    ModuleType.CommonModule
+  }
+)
+public class ExecuteExternalCodeInCommonModuleDiagnostic extends AbstractExecuteExternalCodeDiagnostic {
+  public ExecuteExternalCodeInCommonModuleDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitFile(BSLParser.FileContext ctx) {
+    // если модуль не серверный, не внешнее соединение и не обычный клиент, то не проверяем
+    if (documentContext.getMdObject()
+      .filter(CommonModule.class::isInstance)
+      .map(CommonModule.class::cast)
+      .filter(commonModule -> commonModule.isServer()
+        || commonModule.isClientOrdinaryApplication()
+        || commonModule.isExternalConnection())
+      .isEmpty()) {
+      return ctx;
+    }
+
+    return super.visitFile(ctx);
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Keywords.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Keywords.java
index eab018bf849..7998516b8c8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Keywords.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Keywords.java
@@ -151,6 +151,8 @@ public final class Keywords {
   public static final String EXECUTE_UP_RU = "ВЫПОЛНИТЬ";
   public static final String EXECUTE_EN = "Execute";
   public static final String EXECUTE_UP_EN = "EXECUTE";
+  public static final String EVAL_RU = "Вычислить";
+  public static final String EVAL_EN = "Eval";
   public static final String ADD_HANDLER_RU = "ДобавитьОбработчик";
   public static final String ADD_HANDLER_UP_RU = "ДОБАВИТЬОБРАБОТЧИК";
   public static final String ADD_HANDLER_EN = "AddHandler";
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 41fc71b7ad0..b8bc8634d20 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
@@ -442,6 +442,26 @@
             "title": "Excessive AutoTest Check",
             "$id": "#/definitions/ExcessiveAutoTestCheck"
         },
+        "ExecuteExternalCode": {
+            "description": "Executing of external code on the server",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Executing of external code on the server",
+            "$id": "#/definitions/ExecuteExternalCode"
+        },
+        "ExecuteExternalCodeInCommonModule": {
+            "description": "Executing of external code in a common module on the server",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Executing of external code in a common module on the server",
+            "$id": "#/definitions/ExecuteExternalCodeInCommonModule"
+        },
         "ExtraCommas": {
             "description": "Commas without a parameter at the end of a method call",
             "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 a7cdcb33a0e..153fd814a0f 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
@@ -134,6 +134,12 @@
                 "ExcessiveAutoTestCheck": {
                     "$ref": "parameters-schema.json#/definitions/ExcessiveAutoTestCheck"
                 },
+                "ExecuteExternalCode": {
+                    "$ref": "parameters-schema.json#/definitions/ExecuteExternalCode"
+                },
+                "ExecuteExternalCodeInCommonModule": {
+                    "$ref": "parameters-schema.json#/definitions/ExecuteExternalCodeInCommonModule"
+                },
                 "ExtraCommas": {
                     "$ref": "parameters-schema.json#/definitions/ExtraCommas"
                 },
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_en.properties
new file mode 100644
index 00000000000..f9daa82b245
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=It is forbidden to execute external code on the server
+diagnosticName=Executing of external code on the server
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_ru.properties
new file mode 100644
index 00000000000..79fa02fac93
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Запрещено выполнение произвольного кода на сервере
+diagnosticName=Выполнение произвольного кода на сервере
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_en.properties
new file mode 100644
index 00000000000..6b8e3bef996
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Execution of external code in a common module on a server is a potential vulnerability
+diagnosticName=Executing of external code in a common module on the server
\ No newline at end of file
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_ru.properties
new file mode 100644
index 00000000000..caf27d928cf
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Выполнение произвольного кода в общем модуле на сервере является потенциальной уязвимостью 
+diagnosticName=Выполнение произвольного кода в общем модуле на сервере
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnosticTest.java
new file mode 100644
index 00000000000..44564af3a3e
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeDiagnosticTest.java
@@ -0,0 +1,51 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class ExecuteExternalCodeDiagnosticTest extends AbstractDiagnosticTest<ExecuteExternalCodeDiagnostic> {
+  ExecuteExternalCodeDiagnosticTest() {
+    super(ExecuteExternalCodeDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(5);
+    assertThat(diagnostics, true)
+      .hasRange(8, 4, 21)
+      .hasRange(13, 4, 21)
+      .hasRange(18, 12, 29)
+      .hasRange(23, 12, 29)
+      .hasRange(31, 12, 29)
+    ;
+
+  }
+}
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
new file mode 100644
index 00000000000..ff2fdf640f1
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
@@ -0,0 +1,96 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.utils.Absolute;
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+class ExecuteExternalCodeInCommonModuleDiagnosticTest extends AbstractDiagnosticTest<ExecuteExternalCodeInCommonModuleDiagnostic> {
+  ExecuteExternalCodeInCommonModuleDiagnosticTest() {
+    super(ExecuteExternalCodeInCommonModuleDiagnostic.class);
+  }
+
+  private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_MODULE_FILE = "src/test/resources/metadata/CommonModules/ПервыйОбщийМодуль/Ext/Module.bsl";
+
+  private CommonModule module;
+  private DocumentContext documentContext;
+
+  @Test
+  void testIsServer() {
+
+    getDocumentContextFromFile();
+    when(module.isServer()).thenReturn(Boolean.TRUE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(2, 4, 21)
+      .hasRange(6, 12, 29)
+    ;
+  }
+
+  @Test
+  void testIsNonServer() {
+
+    getDocumentContextFromFile();
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+
+    assertThat(diagnostics).isEmpty();
+  }
+
+  private void getDocumentContextFromFile() {
+    var path = Absolute.path(PATH_TO_METADATA);
+    var testFile = Paths.get(PATH_TO_MODULE_FILE).toAbsolutePath();
+
+    var serverContext = new ServerContext(path);
+    var configuration = spy(serverContext.getConfiguration());
+
+    documentContext = spy(new DocumentContext(
+      testFile.toUri(),
+      getText(),
+      serverContext
+    ));
+
+    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+
+  }
+}
diff --git a/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl b/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
new file mode 100644
index 00000000000..e9de31b4370
--- /dev/null
+++ b/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
@@ -0,0 +1,33 @@
+
+&НаКлиенте
+Процедура ВыполнитьПроизвольныйКодНаКлиенте(Строка)
+    Выполнить(Строка);
+КонецПроцедуры
+
+&НаСервере
+Процедура ВыполнитьПроизвольныйКодНаСервере(Строка)
+    Выполнить(Строка);
+КонецПроцедуры
+
+&НаСервереБезКонтекста
+Процедура ВыполнитьПроизвольныйКодНаСервереБезКонтекста(Строка)
+    Выполнить(Строка);
+КонецПроцедуры
+
+&НаКлиентеНаСервереБезКонтекста
+Функция РассчитатьЧтоТоИзСтрокиБезКонтекст(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции
+
+&НаКлиентеНаСервере
+Функция РассчитатьЧтоТоИзСтроки(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции
+
+Функция БезОшибок(Строка)
+    Возврат ВычислитьЧтоТо(Строка);
+КонецФункции
+
+Функция МетодБезДеректив(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции
diff --git a/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
new file mode 100644
index 00000000000..87b2e14d305
--- /dev/null
+++ b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
@@ -0,0 +1,12 @@
+
+Процедура ВыполнитьПроизвольныйКод(Строка)
+    Выполнить(Строка);
+КонецПроцедуры
+
+Функция РассчитатьЧтоТоИзСтроки(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции
+
+Функция БезОшибок(Строка)
+    Возврат ВычислитьЧтоТо(Строка);
+КонецФункции

From ba4b43f3ecbb4438b8d2148ffd4fa64420a12257 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 12:51:53 +0300
Subject: [PATCH 309/444] precommit

---
 docs/diagnostics/index.md    | 2 +-
 docs/en/diagnostics/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index a653372432c..5e73c492b46 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,7 +8,7 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **108**
+Общее количество: **110**
 
 * Дефект кода: **69**
 * Уязвимость: **3**
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 0ceefdfe898..9873463279a 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,7 +8,7 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **108**
+Total: **110**
 
 * Error: **34**
 * Code smell: **69**

From 814d78c21efa2eca7afcc02e7243fa442cb7a603 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 13:20:17 +0300
Subject: [PATCH 310/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl  | 5 +++++
 .../ExecuteExternalCodeInCommonModuleDiagnostic.bsl          | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl b/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
index e9de31b4370..9ebf1705440 100644
--- a/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
+++ b/src/test/resources/diagnostics/ExecuteExternalCodeDiagnostic.bsl
@@ -31,3 +31,8 @@
 Функция МетодБезДеректив(Строка)
     Возврат Вычислить(Строка);
 КонецФункции
+
+&НаКлиенте
+Функция ВычислениеНаКлиенте(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции
diff --git a/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
index 87b2e14d305..a4bcf06c056 100644
--- a/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
+++ b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
@@ -10,3 +10,8 @@
 Функция БезОшибок(Строка)
     Возврат ВычислитьЧтоТо(Строка);
 КонецФункции
+
+&НаКлиенте
+Функция ВычислениеНаКлиенте(Строка)
+    Возврат Вычислить(Строка);
+КонецФункции

From b47e84cb803aa7b0fc45306b2f6e8c5f5346e50b Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 14 May 2020 13:23:24 +0300
Subject: [PATCH 311/444] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=82=D0=B5=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ernalCodeInCommonModuleDiagnosticTest.java | 37 +++++++++++++++++++
 ...teExternalCodeInCommonModuleDiagnostic.bsl |  4 --
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
index ff2fdf640f1..10d2aa5e6d7 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
@@ -63,6 +63,43 @@ void testIsServer() {
     ;
   }
 
+  @Test
+  void testIsExternal() {
+
+    getDocumentContextFromFile();
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.FALSE);
+    when(module.isExternalConnection()).thenReturn(Boolean.TRUE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(2, 4, 21)
+      .hasRange(6, 12, 29)
+    ;
+  }
+
+  @Test
+  void testIsOrdinary() {
+
+    getDocumentContextFromFile();
+    when(module.isServer()).thenReturn(Boolean.FALSE);
+    when(module.isClientOrdinaryApplication()).thenReturn(Boolean.TRUE);
+    when(module.isExternalConnection()).thenReturn(Boolean.FALSE);
+    when(module.isClientManagedApplication()).thenReturn(Boolean.FALSE);
+    when(documentContext.getMdObject()).thenReturn(Optional.of(module));
+
+    List<Diagnostic> diagnostics = getDiagnostics(documentContext);
+
+    assertThat(diagnostics).hasSize(2);
+    assertThat(diagnostics, true)
+      .hasRange(2, 4, 21)
+      .hasRange(6, 12, 29)
+    ;
+  }
+
   @Test
   void testIsNonServer() {
 
diff --git a/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
index a4bcf06c056..dcfa2a695de 100644
--- a/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
+++ b/src/test/resources/diagnostics/ExecuteExternalCodeInCommonModuleDiagnostic.bsl
@@ -11,7 +11,3 @@
     Возврат ВычислитьЧтоТо(Строка);
 КонецФункции
 
-&НаКлиенте
-Функция ВычислениеНаКлиенте(Строка)
-    Возврат Вычислить(Строка);
-КонецФункции

From 2aefb34a8931c42041c7d1bb26ab8191e302560f Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 15 May 2020 09:11:53 +0300
Subject: [PATCH 312/444] Update docs/faq.md

Co-authored-by: Nikita Gryzlov <nixel2007@gmail.com>
---
 docs/faq.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 5b75b194307..9212686f81a 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -25,4 +25,11 @@
 
 `BSL Language Server` является самостоятельным приложением, реализацией серверной части протокола LSP. Плагин для SonarQube использует `BSL Language Server` для выполнения анализа исходного кода языка BSL (конфигурации 1С, скрипты 1Scipt и OSWeb).
 
-`BSL Language Server` может быть использован с любым приложением, имеющим реализацию LSP клиента, на данный момент это плагины для [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/), [1C:Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (собственная реализация, без LSP), плагин для [SonarQube](https://github.com/1c-syntax/sonar-bsl-plugin-community), [Phoenix BSL](https://github.com/otymko/phoenixbsl)
+`BSL Language Server` может быть использован с любым приложением, имеющим реализацию LSP клиента. Проверенные подключения:
+* плагин для [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/);
+* дополнительная утилита для Конфигуратора [Phoenix BSL](https://github.com/otymko/phoenixbsl);
+* плагин для Sublime Text [https://github.com/sublimelsp/LSP].
+
+Так же через прямой импорт `BSL Language Server` работают:
+* плагин для [1C:Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (собственная реализация, без LSP);
+* плагин для [SonarQube](https://github.com/1c-syntax/sonar-bsl-plugin-community);

From b8c6354b6cbe21c25e0519a50a651949a66d39c7 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 09:59:37 +0300
Subject: [PATCH 313/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=87=D0=B0=D1=81=D1=82=D0=B8=D1=87=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codelens/CodeLensOptions.java             |  3 ++-
 .../diagnostics/DiagnosticsOptions.java       |  3 ++-
 .../LanguageServerConfigurationTest.java      | 27 +++++++++++++++++++
 .../.partial-bsl-language-server.json         |  9 +++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/.partial-bsl-language-server.json

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
index 7b0eab8ee15..de5f466b76e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/codelens/CodeLensOptions.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration.codelens;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -30,7 +31,7 @@
  * Корневой класс для настройки {@link com.github._1c_syntax.bsl.languageserver.providers.CodeLensProvider}
  */
 @Data
-@AllArgsConstructor
+@AllArgsConstructor(onConstructor = @__({@JsonCreator(mode = JsonCreator.Mode.DISABLED)}))
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CodeLensOptions {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
index 2cbee0dde56..f53e3977293 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/DiagnosticsOptions.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration.diagnostics;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.databind.ParametersDeserializer;
@@ -36,7 +37,7 @@
  * Корневой класс для настройки {@link com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider}
  */
 @Data
-@AllArgsConstructor
+@AllArgsConstructor(onConstructor = @__({@JsonCreator(mode = JsonCreator.Mode.DISABLED)}))
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DiagnosticsOptions {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index b903401b556..c1fc77b6683 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -21,7 +21,10 @@
  */
 package com.github._1c_syntax.bsl.languageserver.configuration;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.codelens.CodeLensOptions;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Mode;
+import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
 import com.github._1c_syntax.utils.Absolute;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.junit.jupiter.api.BeforeEach;
@@ -43,6 +46,8 @@ class LanguageServerConfigurationTest {
   private static final String PATH_TO_CONFIGURATION_FILE = "./src/test/resources/.bsl-language-server.json";
   private static final String PATH_TO_EMPTY_CONFIGURATION_FILE = "./src/test/resources/.empty-bsl-language-server.json";
   private static final String PATH_TO_METADATA = "src/test/resources/metadata";
+  private static final String PATH_TO_PARTIAL_CONFIGURATION_FILE
+    = "./src/test/resources/.partial-bsl-language-server.json";
 
   @BeforeEach
   void startUp() throws IOException {
@@ -130,4 +135,26 @@ void test_GetCustomConfigurationRoot() {
 
   }
 
+  @Test
+  void testPartialInitialization() {
+    // given
+    File configurationFile = new File(PATH_TO_PARTIAL_CONFIGURATION_FILE);
+
+    // when
+    LanguageServerConfiguration configuration = LanguageServerConfiguration.create(configurationFile);
+
+    CodeLensOptions codeLensOptions = configuration.getCodeLensOptions();
+    DiagnosticsOptions diagnosticsOptions = configuration.getDiagnosticsOptions();
+
+    // then
+    assertThat(codeLensOptions.isShowCognitiveComplexity()).isTrue();
+    assertThat(codeLensOptions.isShowCyclomaticComplexity()).isFalse();
+
+    assertThat(configuration.getLanguage()).isEqualTo(DEFAULT_LANGUAGE);
+
+    assertThat(diagnosticsOptions.getMode()).isEqualTo(Mode.ON);
+    assertThat(diagnosticsOptions.getSkipSupport()).isEqualTo(SkipSupport.NEVER);
+    assertThat(diagnosticsOptions.getParameters()).isEmpty();
+  }
+
 }
\ No newline at end of file
diff --git a/src/test/resources/.partial-bsl-language-server.json b/src/test/resources/.partial-bsl-language-server.json
new file mode 100644
index 00000000000..3c4a11dd320
--- /dev/null
+++ b/src/test/resources/.partial-bsl-language-server.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://1c-syntax.github.io/bsl-language-server/dev/configuration/schema.json",
+  "codeLens": {
+    "showCyclomaticComplexity": false
+  },
+  "diagnostics": {
+    "mode": "on"
+  }
+}

From 367314ee5106b4233087ad8ee54c93b2369f56b0 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 15:10:05 +0300
Subject: [PATCH 314/444] =?UTF-8?q?=D0=A5=D0=B5=D0=BB=D0=BF=D0=B5=D1=80=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=BE=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=87=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/metadata/DiagnosticInfo.java  | 10 +---
 .../bsl/languageserver/utils/Resources.java   | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Resources.java

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
index 5e9ecbe2977..58a2d3cb9f9 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadata/DiagnosticInfo.java
@@ -23,7 +23,7 @@
 
 import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
-import com.github._1c_syntax.bsl.languageserver.utils.UTF8Control;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -35,10 +35,8 @@
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
 import static com.github._1c_syntax.bsl.languageserver.configuration.Language.DEFAULT_LANGUAGE;
@@ -109,13 +107,11 @@ public String getMessage(Object... args) {
   }
 
   public String getResourceString(String key) {
-    String languageCode = language.getLanguageCode();
-    Locale locale = Locale.forLanguageTag(languageCode);
-    return ResourceBundle.getBundle(diagnosticClass.getName(), locale, new UTF8Control()).getString(key).intern();
+    return Resources.getResourceString(language, diagnosticClass, key);
   }
 
   public String getResourceString(String key, Object... args) {
-    return String.format(getResourceString(key), args).intern();
+    return Resources.getResourceString(language, diagnosticClass, key, args);
   }
 
   public DiagnosticType getType() {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Resources.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Resources.java
new file mode 100644
index 00000000000..ce7b523e0fc
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/Resources.java
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.utils;
+
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
+import lombok.experimental.UtilityClass;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Вспомогательный класс для оптимизированного чтения ресурсов прикладных классов с учетом {@link Language}.
+ */
+@UtilityClass
+public class Resources {
+
+  /**
+   * @param language Язык получения ресурсной строки.
+   * @param clazz Класс, ресурсы которого необходимо прочитать.
+   * @param key Ключ из {@link ResourceBundle}.
+   * @return Содержимое ресурса.
+   */
+  public String getResourceString(Language language, Class<?> clazz, String key) {
+    String languageCode = language.getLanguageCode();
+    Locale locale = Locale.forLanguageTag(languageCode);
+    return ResourceBundle.getBundle(clazz.getName(), locale, new UTF8Control()).getString(key).intern();
+  }
+  /**
+   * @param language Язык получения ресурсной строки.
+   * @param clazz Класс, ресурсы которого необходимо прочитать.
+   * @param key Ключ из {@link ResourceBundle}.
+   * @param args Аргументы для форматирования ресурсной строки.
+   * @return Содержимое ресурса.
+   */
+  public String getResourceString(Language language, Class<?> clazz, String key, Object... args) {
+    return String.format(getResourceString(language, clazz, key), args).intern();
+  }
+}

From cff8e785d69c1ded31fe7c369453ed521563af07 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 15:10:49 +0300
Subject: [PATCH 315/444] =?UTF-8?q?=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=D1=8B=20document=20link=20+=20tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LanguageServerConfiguration.java          |  5 ++
 .../documentlink/DocumentLinkOptions.java     | 40 +++++++++
 .../documentlink/package-info.java            | 26 ++++++
 .../providers/DocumentLinkProvider.java       | 38 +++++++--
 .../DocumentLinkProvider_en.properties        |  1 +
 .../DocumentLinkProvider_ru.properties        |  1 +
 .../providers/DocumentLinkProviderTest.java   | 84 +++++++++++++++++++
 7 files changed, 186 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/package-info.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
index ca9aa5ee0d8..a3026b80f82 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github._1c_syntax.bsl.languageserver.configuration.codelens.CodeLensOptions;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.documentlink.DocumentLinkOptions;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -68,6 +69,9 @@ public final class LanguageServerConfiguration {
   @JsonProperty("codeLens")
   private final CodeLensOptions codeLensOptions;
 
+  @JsonProperty("documentLink")
+  private final DocumentLinkOptions documentLinkOptions;
+
   @Nullable
   private File traceLog;
 
@@ -79,6 +83,7 @@ private LanguageServerConfiguration() {
       Language.DEFAULT_LANGUAGE,
       new DiagnosticsOptions(),
       new CodeLensOptions(),
+      new DocumentLinkOptions(),
       null,
       null
     );
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
new file mode 100644
index 00000000000..b4142087701
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
@@ -0,0 +1,40 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.configuration.documentlink;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Корневой класс для настройки {@link com.github._1c_syntax.bsl.languageserver.providers.DocumentLinkProvider}
+ */
+@Data
+@AllArgsConstructor(onConstructor = @__({@JsonCreator(mode = JsonCreator.Mode.DISABLED)}))
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DocumentLinkOptions {
+  private boolean useDevSite;
+  private String siteRoot = "https://1c-syntax.github.io/bsl-language-server";
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/package-info.java
new file mode 100644
index 00000000000..2c15f7357ea
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.
+ */
+
+/**
+ * Пакет содержит настройки {@link com.github._1c_syntax.bsl.languageserver.providers.DocumentLinkProvider}
+ */
+package com.github._1c_syntax.bsl.languageserver.configuration.documentlink;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
index 0e4faeb3aa0..e6fc10c4545 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
@@ -25,18 +25,17 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import org.eclipse.lsp4j.DocumentLink;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Класс-провайдер для реализации формирования ссылки на страницу с информацией по диагностике
  */
 public class DocumentLinkProvider {
   private final DiagnosticProvider diagnosticProvider;
-  private static final String SITE_URL_RU = "https://1c-syntax.github.io/bsl-language-server/diagnostics/";
-  private static final String SITE_URL_EN = "https://1c-syntax.github.io/bsl-language-server/en/diagnostics/";
   private final LanguageServerConfiguration configuration;
 
   public DocumentLinkProvider(LanguageServerConfiguration configuration, DiagnosticProvider diagnosticProvider) {
@@ -45,11 +44,32 @@ public DocumentLinkProvider(LanguageServerConfiguration configuration, Diagnosti
   }
 
   public List<DocumentLink> getDocumentLinks(DocumentContext documentContext) {
-    List<DocumentLink> documentLinks = new ArrayList<>();
-    var siteDiagnosticsUrl = configuration.getLanguage() == Language.EN ? SITE_URL_EN : SITE_URL_RU;
-    diagnosticProvider.getComputedDiagnostics(documentContext)
-      .forEach(diagnostic -> documentLinks.add(new DocumentLink(diagnostic.getRange(),
-        siteDiagnosticsUrl + DiagnosticCode.getStringValue(diagnostic.getCode()))));
-    return documentLinks;
+
+    var linkOptions = configuration.getDocumentLinkOptions();
+    var language = configuration.getLanguage();
+
+    var siteRoot = linkOptions.getSiteRoot();
+    var devSuffix = linkOptions.isUseDevSite() ? "/dev" : "";
+    var languageSuffix = language == Language.EN ? "/en" : "";
+
+    var siteDiagnosticsUrl = String.format(
+      "%s%s%s/diagnostics/",
+      siteRoot,
+      devSuffix,
+      languageSuffix
+      );
+
+    var tooltip = Resources.getResourceString(language, this.getClass(), "tooltip");
+
+    return diagnosticProvider.getComputedDiagnostics(documentContext).stream()
+      .map(diagnostic ->
+        new DocumentLink(
+          diagnostic.getRange(),
+          siteDiagnosticsUrl + DiagnosticCode.getStringValue(diagnostic.getCode()),
+          null,
+          tooltip
+        )
+      )
+      .collect(Collectors.toList());
   }
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
new file mode 100644
index 00000000000..740413d43fe
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
@@ -0,0 +1 @@
+tooltip=Diagnostics documentation
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties
new file mode 100644
index 00000000000..3b3dd7d1be5
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties
@@ -0,0 +1 @@
+tooltip=Документация диагностики
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
index 4e3e792668d..77c3f922eab 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.providers;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.DiagnosticSupplier;
@@ -81,6 +82,89 @@ void testGetDocumentLinksEn() {
       .hasSize(3);
   }
 
+  @Test
+  void testDevSite() {
+    // given
+    var configuration = LanguageServerConfiguration.create();
+    var documentLinkOptions = configuration.getDocumentLinkOptions();
+    var documentContext = getDocumentContext();
+    var documentLinkProvider = getDocumentLinkProvider(configuration, documentContext);
+
+    // when
+    documentLinkOptions.setUseDevSite(false);
+    var documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> !documentLink.getTarget().contains("/dev/"));
+
+    // when
+    documentLinkOptions.setUseDevSite(true);
+    documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> documentLink.getTarget().contains("/dev/"));
+
+    // when
+    documentLinkOptions.setUseDevSite(true);
+    configuration.setLanguage(Language.EN);
+    documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> documentLink.getTarget().contains("/dev/"))
+      .allMatch(documentLink -> documentLink.getTarget().contains("/en/"));
+
+  }
+
+  @Test
+  void testTooltip() {
+    var configuration = LanguageServerConfiguration.create();
+    var documentContext = getDocumentContext();
+    var documentLinkProvider = getDocumentLinkProvider(configuration, documentContext);
+
+    // when
+    configuration.setLanguage(Language.RU);
+    var documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> documentLink.getTooltip().contains("Документация"));
+
+    // when
+    configuration.setLanguage(Language.EN);
+    documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> documentLink.getTooltip().contains("documentation"));
+  }
+
+  @Test
+  void testSiteRoot() {
+    var configuration = LanguageServerConfiguration.create();
+    var documentContext = getDocumentContext();
+    var documentLinkProvider = getDocumentLinkProvider(configuration, documentContext);
+
+    // when
+    var documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> documentLink.getTarget().startsWith("https://1c-syntax"));
+
+    // when
+    configuration.getDocumentLinkOptions().setSiteRoot("https://fake");
+    documentLinks = documentLinkProvider.getDocumentLinks(documentContext);
+
+    // then
+    assertThat(documentLinks)
+      .allMatch(documentLink -> !documentLink.getTarget().startsWith("https://1c-syntax"))
+      .allMatch(documentLink -> documentLink.getTarget().startsWith("https://fake"))
+    ;
+  }
+
   @NotNull
   private DocumentLinkProvider getDocumentLinkProvider(LanguageServerConfiguration configuration, DocumentContext documentContext) {
     var diagnosticSupplier = new DiagnosticSupplier(configuration);

From e08586d298d94081f33e76293109f7e37a6e99dc Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 15:21:13 +0300
Subject: [PATCH 316/444] isUseDevSite -> useDevSite

---
 .idea/jsonSchemas.xml                         | 24 +++++++++++++++++++
 .../documentlink/DocumentLinkOptions.java     |  7 ++++++
 .../providers/DocumentLinkProvider.java       |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 .idea/jsonSchemas.xml

diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
new file mode 100644
index 00000000000..01a2f6fa813
--- /dev/null
+++ b/.idea/jsonSchemas.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JsonSchemaMappingsProjectConfiguration">
+    <state>
+      <map>
+        <entry key="schema">
+          <value>
+            <SchemaInfo>
+              <option name="name" value="schema" />
+              <option name="relativePathToSchema" value="src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="path" value="src/test/resources/.bsl-language-server.json" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
+      </map>
+    </state>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
index b4142087701..28fe7760d0c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/documentlink/DocumentLinkOptions.java
@@ -23,8 +23,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 /**
@@ -35,6 +37,11 @@
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DocumentLinkOptions {
+  @Getter(AccessLevel.NONE)
   private boolean useDevSite;
   private String siteRoot = "https://1c-syntax.github.io/bsl-language-server";
+
+  public boolean useDevSite() {
+    return useDevSite;
+  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
index e6fc10c4545..5d5870d0ddf 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
@@ -49,7 +49,7 @@ public List<DocumentLink> getDocumentLinks(DocumentContext documentContext) {
     var language = configuration.getLanguage();
 
     var siteRoot = linkOptions.getSiteRoot();
-    var devSuffix = linkOptions.isUseDevSite() ? "/dev" : "";
+    var devSuffix = linkOptions.useDevSite() ? "/dev" : "";
     var languageSuffix = language == Language.EN ? "/en" : "";
 
     var siteDiagnosticsUrl = String.format(

From b45bdec6ddcd62f40453a7e905893b2949c8d154 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 15:21:33 +0300
Subject: [PATCH 317/444] =?UTF-8?q?=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?=
 =?UTF-8?q?=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/LanguageServerConfigurationTest.java         | 2 ++
 src/test/resources/.bsl-language-server.json                   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
index c1fc77b6683..229a5472f20 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfigurationTest.java
@@ -99,6 +99,8 @@ void createFromFile() {
     Path configurationRoot = configuration.getConfigurationRoot();
     assertThat(configurationRoot).isNotEqualTo(null);
 
+    assertThat(configuration.getDocumentLinkOptions().useDevSite()).isTrue();
+
   }
 
   @Test
diff --git a/src/test/resources/.bsl-language-server.json b/src/test/resources/.bsl-language-server.json
index b06e9d59b29..20d02460c0f 100644
--- a/src/test/resources/.bsl-language-server.json
+++ b/src/test/resources/.bsl-language-server.json
@@ -15,6 +15,9 @@
       "MethodSize": false
     }
   },
+  "documentLink": {
+    "useDevSite": true
+  },
   "traceLog": "build/.trace.log",
   "configurationRoot": "src/test/resources/metadata"
 }

From c22adf6b832a2303a8600cfee59f09a5cd2b6c49 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 15 May 2020 15:25:12 +0300
Subject: [PATCH 318/444] =?UTF-8?q?=D0=A1=D1=85=D0=B5=D0=BC=D0=B0=20+=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/features/ConfigurationFile.md            |  3 +++
 .../languageserver/configuration/schema.json  | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/docs/features/ConfigurationFile.md b/docs/features/ConfigurationFile.md
index fb33c40d8c8..a22e9ac295c 100644
--- a/docs/features/ConfigurationFile.md
+++ b/docs/features/ConfigurationFile.md
@@ -16,6 +16,9 @@ BSL Language Server предоставляет возможность измен
 |⤷&nbsp;&nbsp;&nbsp;`skipSupport`|`Строка`|Этим параметром настраивается режим пропуска файлов *(т.е. файлы не анализируются на предмет наличия замечаний)* **конфигурации 1С**, находящихся "на поддержке" конфигурации поставщика. Возможные значения:<br/>* `withSupport` - пропускаются все модули, находящиеся "на поддержке" *(все виды "замков")*<br/>* `withSupportLocked` - пропускаются только модули, находящиеся "на поддержке" с запретом изменений *("желтый закрытый замок")*<br/>* `never` - режим поддержки не анализируется и модули не пропускаются *(установлен по умолчанию)*|
 |⤷&nbsp;&nbsp;&nbsp;`mode`|`Строка`|Настройка для управления режимом учета настроек диагностик. Возможные варианты:<br/>* `OFF` - Все диагностики считаются выключенными, вне зависимости от их настроек <br/>* `ON` - Все диагностики включенные по умолчанию считаются включенными, остальные - в зависимости от личных настроек <br/>* `EXCEPT` - Все диагностистики, кроме указанных, считаются включенными <br/>* `ONLY` - Только указанные диагностики считаются включенными <br/>* `ALL` - Все диагностики считаются включенными|
 |⤷&nbsp;&nbsp;&nbsp;`parameters`|`JSON-Объект`|Параметр представляет собой коллекцию настроек диагностик. Элементами коллекции являются json-объекты следующей структуры:<br/>* *ключ объекта* - строка, являющаяся ключом диагностики<br/>* *значение объекта* - может принимать либо булево значение, и тогда интерпретируется как отключение диагностики (`false`) или ее включение с параметрами по умолчанию (`true`), либо значение типа `json-объект`, представляющего собой набор настроек диагностики.<br/><br/>Ключ, включена ли по умолчанию, а также описание возможных параметров и примеры для конфигурационного файла представлены на странице с описанием каждой диагностики.|
+|`documentLink`|`JSON-Объект`|Содержит настройки ссылок на документацию|
+|⤷&nbsp;&nbsp;&nbsp;`useDevSite`|`Булево`|При включении настройки формирующиеся ссылки на документацию будут вести на develop-версию сайта. По умолчанию параметр выключен (*установлен в `false`*)|
+|⤷&nbsp;&nbsp;&nbsp;`siteRoot`|`Строка`|Путь к корню сайта с документацией. По умолчанию параметр имеет значение `"https://1c-syntax.github.io/bsl-language-server"` |
 |`traceLog`|`Строка`|Для логирования всех запросов *(входящих и исходящих)* между **BSL Language Server** и **Language Client** из используемого редактора/IDE, в этом параметре можно указать путь к файлу лога. Путь можно указывать как абсолютный, так и относительный *(от корня анализируемого проекта)*, по умолчанию значение не заполнено.<br/><br/>**ВНИМАНИЕ**<br/><br/>* При запуске **BSL Language Server** перезаписывает указанный файл<br/>* Скорость взаимодействия между клиентом и сервером **ЗНАЧИТЕЛЬНО ЗАМЕДЛЯЕТСЯ**|
 |`configurationRoot`|`Строка`|Данный параметр предназначен для указания корневого каталога, в котором находятся файлы конфигурации 1С в каталоге проекта. Может быть полезен в случае нахождения нескольких каталогов конфигураций в одном каталоге проекта либо при сложной структуре каталога проекта. По умолчанию параметр не заполнен и `BSL Language Server` самостоятельно определяет расположение корневого каталога конфигурации|
 
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 153fd814a0f..ae234928712 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
@@ -393,6 +393,26 @@
                 }
             }
         },
+        "documentLink": {
+            "$id": "#/properties/documentLink",
+            "type": "object",
+            "title": "Document link configuration.",
+            "default": null,
+            "properties": {
+                "useDevSite": {
+                    "$id": "#/properties/useDevSite",
+                    "type": "boolean",
+                    "title": "Use develop version of site for documentation links.",
+                    "default": false
+                },
+                "siteRoot": {
+                    "$id": "#/properties/siteRoot",
+                    "type": "string",
+                    "title": "Root URL for documentation links.",
+                    "default": "https://1c-syntax.github.io/bsl-language-server"
+                }
+            }
+        },
         "diagnostics": {
             "$id": "#/properties/diagnostics",
             "type": "object",

From bbbda213f8c2a9b9b66c8209daa7a88c80c7eb9d Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 19 May 2020 13:59:11 +0300
Subject: [PATCH 319/444] =?UTF-8?q?=D0=9E=D1=87=D0=B8=D1=81=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_1c_syntax/bsl/languageserver/context/DocumentContext.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index b5a3027834a..922a1317730 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -196,6 +196,7 @@ public Optional<MDObjectBase> getMdObject() {
   public void rebuild(String content) {
     computeLock.lock();
     clearSecondaryData();
+    symbolTree.clear();
     this.content = content;
     tokenizer = new Tokenizer(content);
     computeLock.unlock();

From e651c692d35b7114f5e41b0f2c26847f8f9d7689 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 8 May 2020 17:58:56 +0300
Subject: [PATCH 320/444] =?UTF-8?q?=D0=94=D1=80=D0=B0=D1=84=D1=82=20=D0=B4?=
 =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D1=85=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/diagnostics/DeprecatedMethodCall.md      |  36 ++++++
 docs/en/diagnostics/DeprecatedMethodCall.md   |  36 ++++++
 .../DeprecatedMethodCallDiagnostic.java       | 107 ++++++++++++++++++
 .../languageserver/utils/MdoRefBuilder.java   |  47 ++++++++
 ...precatedMethodCallDiagnostic_en.properties |   2 +
 ...precatedMethodCallDiagnostic_ru.properties |   2 +
 .../DeprecatedMethodCallDiagnosticTest.java   |  46 ++++++++
 .../DeprecatedMethodCallDiagnostic.bsl        |   1 +
 8 files changed, 277 insertions(+)
 create mode 100644 docs/diagnostics/DeprecatedMethodCall.md
 create mode 100644 docs/en/diagnostics/DeprecatedMethodCall.md
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
 create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
 create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
 create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
 create mode 100644 src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl

diff --git a/docs/diagnostics/DeprecatedMethodCall.md b/docs/diagnostics/DeprecatedMethodCall.md
new file mode 100644
index 00000000000..6fcb1ecdbe5
--- /dev/null
+++ b/docs/diagnostics/DeprecatedMethodCall.md
@@ -0,0 +1,36 @@
+# <Diagnostic name> (<DiagnosticKey>)
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Описание диагностики
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Примеры
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Источники
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Сниппеты
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Экранирование кода
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Параметр конфигурационного файла
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
\ No newline at end of file
diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
new file mode 100644
index 00000000000..4e7e0f78ada
--- /dev/null
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -0,0 +1,36 @@
+# <Diagnostic name>
+
+<Metadata>
+
+## <Params>
+
+<!-- Блоки выше заполняются автоматически, не трогать -->
+## Description
+<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+## Examples
+<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+<!-- Примеры источников
+
+* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
+* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
+## Snippets
+<!-- Блоки ниже заполняются автоматически, не трогать -->
+
+### Diagnostic ignorance in code
+
+```bsl
+// BSLLS:<DiagnosticKey>-off
+// BSLLS:<DiagnosticKey>-on
+```
+
+### Parameter for config
+
+```json
+"<DiagnosticKey>": <DiagnosticConfig>
+```
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
new file mode 100644
index 00000000000..5edc85f6a18
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -0,0 +1,107 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.utils.MdoRefBuilder;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import javax.annotation.CheckForNull;
+
+@DiagnosticMetadata(
+  type = DiagnosticType.CODE_SMELL,
+  severity = DiagnosticSeverity.MAJOR,
+  minutesToFix = 1,
+  tags = {
+    DiagnosticTag.DEPRECATED,
+    DiagnosticTag.DESIGN
+  }
+
+)
+public class DeprecatedMethodCallDiagnostic extends AbstractVisitorDiagnostic {
+  public DeprecatedMethodCallDiagnostic(DiagnosticInfo info) {
+    super(info);
+  }
+
+  @Override
+  public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
+
+    if (ctx.globalMethodCall() != null) {
+      return super.visitCallStatement(ctx);
+    }
+
+    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
+    if (mdoRef.isEmpty()) {
+      return super.visitCallStatement(ctx);
+    }
+
+    var documentContexts = documentContext.getServerContext().getDocuments(mdoRef);
+    if (documentContexts == null) {
+      return super.visitCallStatement(ctx);
+    }
+
+    Token methodName = getMethodName(ctx);
+    if (methodName == null) {
+      return super.visitCallStatement(ctx);
+    }
+
+    String methodNameText = methodName.getText();
+
+    documentContexts.values().stream()
+      .map(DocumentContext::getSymbolTree)
+      .flatMap(symbolTree -> symbolTree.getMethods().stream())
+      .filter(methodSymbol -> methodSymbol.isDeprecated()
+        && methodSymbol.getName().equalsIgnoreCase(methodNameText))
+      .findAny()
+      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
+
+    return super.visitCallStatement(ctx);
+  }
+
+  @CheckForNull
+  private static Token getMethodName(BSLParser.CallStatementContext ctx) {
+
+    var modifiers = ctx.modifier();
+    if (modifiers.isEmpty()) {
+      return getMethodName(ctx.accessCall());
+    } else {
+      // пока только общие модули
+      BSLParser.ModifierContext firstModifier = modifiers.get(0);
+      if (firstModifier.accessCall() != null) {
+        return getMethodName(firstModifier.accessCall());
+      }
+    }
+
+    return null;
+  }
+
+  private static Token getMethodName(BSLParser.AccessCallContext ctx) {
+    return ctx.methodCall().methodName().getStart();
+  }
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
new file mode 100644
index 00000000000..7158b29b826
--- /dev/null
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
@@ -0,0 +1,47 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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.utils;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.parser.BSLParser;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class MdoRefBuilder {
+
+  public String getMdoRef(DocumentContext documentContext, BSLParser.CallStatementContext callStatement) {
+    String mdoRef = "";
+
+    if (callStatement.IDENTIFIER() != null) {
+      var commonModuleName = callStatement.IDENTIFIER().getText();
+      var commonModule = documentContext.getServerContext()
+        .getConfiguration()
+        .getCommonModule(commonModuleName);
+      if (commonModule.isPresent()) {
+        mdoRef = commonModule.orElseThrow().getMdoRef();
+      }
+    }
+
+    return mdoRef;
+  }
+
+}
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
new file mode 100644
index 00000000000..bae879b1aa4
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Remove deprecated method call
+diagnosticName=Deprecated methods should not be used
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
new file mode 100644
index 00000000000..2c67956a6ea
--- /dev/null
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
@@ -0,0 +1,2 @@
+diagnosticMessage=Удалите вызов устаревшего метода
+diagnosticName=Устаревшие методы не должны использоваться
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
new file mode 100644
index 00000000000..6ea1ff1ade8
--- /dev/null
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
@@ -0,0 +1,46 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright © 2018-2020
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Gryzlov <nixel2007@gmail.com> 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;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class DeprecatedMethodCallDiagnosticTest extends AbstractDiagnosticTest<DeprecatedMethodCallDiagnostic> {
+  DeprecatedMethodCallDiagnosticTest() {
+    super(DeprecatedMethodCallDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics, true)
+      .hasRange(6, 0, 6, 20);
+
+  }
+}
diff --git a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
@@ -0,0 +1 @@
+

From 9b6c683e1590124c2946c4ac32d1f638ba307435 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 19 May 2020 18:13:28 +0300
Subject: [PATCH 321/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?=
 =?UTF-8?q?=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20=D1=80=D0=B5?=
 =?UTF-8?q?=D1=81=D1=83=D1=80=D1=81=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/MethodSymbolComputerTest.java    |  15 +-
 .../NonStandardRegionDiagnosticTest.java      |   2 +-
 .../DeprecatedMethodCallDiagnostic.bsl        |  14 ++
 ...\276\321\207\320\275\320\270\320\2721.xml" |  11 +-
 ...1\213\320\261\320\276\321\200\320\260.xml" |   6 +-
 .../Ext/Form.xml"                             |   5 +-
 .../Ext/Form/Module.bsl"                      |   2 +-
 ...0\277\320\270\321\201\320\272\320\260.xml" |   6 +-
 .../Ext/Form.xml"                             |   5 +-
 ...0\274\320\265\320\275\321\202\320\260.xml" |   2 +-
 .../Ext/Form.xml"                             |   2 +-
 ...0\234\320\260\320\272\320\265\321\202.xml" |   2 +-
 ...\276\320\274\320\260\320\275\320\2641.xml" |  27 +++
 ...0\276\320\264\321\203\320\273\321\214.xml" |   2 +-
 .../Ext/Module.bsl"                           |  24 ++-
 .../resources/metadata/ConfigDumpInfo.xml     |  43 +++--
 src/test/resources/metadata/Configuration.xml | 166 ++++++++++++------
 ...\264\320\265\320\275\320\270\320\2711.xml" |   4 +-
 .../Ext/ManagerModule.bsl"                    |  19 ++
 ...1\201\321\201\320\272\320\270\320\271.xml" |   2 +-
 20 files changed, 263 insertions(+), 96 deletions(-)
 create mode 100644 "src/test/resources/metadata/CommandGroups/\320\223\321\200\321\203\320\277\320\277\320\260\320\232\320\276\320\274\320\260\320\275\320\2641.xml"
 create mode 100644 "src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711/Ext/ManagerModule.bsl"

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index a87d3889c4d..db2a620cf92 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -115,9 +115,9 @@ void testMdoRef() throws IOException {
 
     var path = Absolute.path(PATH_TO_METADATA);
     var serverContext = new ServerContext(path);
-    checkModule(serverContext, PATH_TO_MODULE_FILE, "CommonModule.ПервыйОбщийМодуль");
-    checkModule(serverContext, PATH_TO_CATALOG_FILE, "Catalog.Справочник1");
-    checkModule(serverContext, PATH_TO_CATALOG_MODULE_FILE, "Catalog.Справочник1");
+    checkModule(serverContext, PATH_TO_MODULE_FILE, "CommonModule.ПервыйОбщийМодуль", 5);
+    checkModule(serverContext, PATH_TO_CATALOG_FILE, "Catalog.Справочник1", 1);
+    checkModule(serverContext, PATH_TO_CATALOG_MODULE_FILE, "Catalog.Справочник1", 1);
   }
 
   @Test
@@ -131,12 +131,17 @@ void testParseError() {
 
   }
 
-  private void checkModule(ServerContext serverContext, String path, String mdoRef) throws IOException {
+  private void checkModule(
+    ServerContext serverContext,
+    String path,
+    String mdoRef,
+    int methodsCount
+  ) throws IOException {
     var file = new File(PATH_TO_METADATA, path);
     var uri = Absolute.uri(file);
     var documentContext = serverContext.addDocument(uri, FileUtils.readFileToString(file, StandardCharsets.UTF_8));
     List<MethodSymbol> methods = documentContext.getSymbolTree().getMethods();
-    assertThat(methods.size()).isEqualTo(1);
+    assertThat(methods.size()).isEqualTo(methodsCount);
     assertThat(methods.get(0).getName()).isEqualTo("Тест");
     assertThat(methods.get(0).getMdoRef()).isEqualTo(mdoRef);
   }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
index d653f9ec34e..9736e9eb9e2 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnosticTest.java
@@ -141,7 +141,7 @@ void testCommonModule() throws IOException {
       .hasRange(41, 1, 63)
       .hasRange(45, 1, 31)
       .hasRange(49, 1, 27)
-      .hasRange(57, 1, 18)
+      .hasRange(77, 1, 18)
     ;
   }
 
diff --git a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
index 8b137891791..827d2cbf37f 100644
--- a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
@@ -1 +1,15 @@
 
+ПервыйОбщийМодуль.УстаревшаяПроцедура();
+ПервыйОбщийМодуль.НеУстаревшаяПроцедура();
+
+ПервыйОбщийМодуль.УстаревшаяФункция();
+ПервыйОбщийМодуль.НеУстаревшаяФункция();
+
+А = ПервыйОбщийМодуль.УстаревшаяФункция();
+А = ПервыйОбщийМодуль.НеУстаревшаяФункция();
+
+Если ПервыйОбщийМодуль.УстаревшаяФункция() Тогда
+КонецЕсли;
+
+Если ПервыйОбщийМодуль.НеУстаревшаяФункция() Тогда
+КонецЕсли;
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.xml"
index 10535036b21..b6dffa7188f 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Catalog uuid="eeef463d-d5e7-42f2-ae53-10279661f59d">
 		<InternalInfo>
 			<xr:GeneratedType name="CatalogObject.Справочник1" category="Object">
@@ -77,6 +77,9 @@
 			<Explanation/>
 			<CreateOnInput>Use</CreateOnInput>
 			<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
+			<DataHistory>DontUse</DataHistory>
+			<UpdateDataHistoryImmediatelyAfterWrite>false</UpdateDataHistoryImmediatelyAfterWrite>
+			<ExecuteAfterWriteDataHistoryVersionProcessing>false</ExecuteAfterWriteDataHistoryVersionProcessing>
 		</Properties>
 		<ChildObjects>
 			<Attribute uuid="f4b6bb58-962f-4811-809c-84514f07f16d">
@@ -115,6 +118,7 @@
 					<Use>ForItem</Use>
 					<Indexing>DontIndex</Indexing>
 					<FullTextSearch>Use</FullTextSearch>
+					<DataHistory>Use</DataHistory>
 				</Properties>
 			</Attribute>
 			<Attribute uuid="dff5b5d8-762d-4490-a336-dcc8d93c17d5">
@@ -154,6 +158,7 @@
 					<Use>ForItem</Use>
 					<Indexing>DontIndex</Indexing>
 					<FullTextSearch>Use</FullTextSearch>
+					<DataHistory>Use</DataHistory>
 				</Properties>
 			</Attribute>
 			<Attribute uuid="ecd3c57a-75c8-474c-9c48-ac4c3831ab15">
@@ -188,6 +193,7 @@
 					<Use>ForItem</Use>
 					<Indexing>DontIndex</Indexing>
 					<FullTextSearch>Use</FullTextSearch>
+					<DataHistory>Use</DataHistory>
 				</Properties>
 			</Attribute>
 			<TabularSection uuid="451202c5-b1af-4bce-a705-0b5570071588">
@@ -243,6 +249,7 @@
 							<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
 							<Indexing>DontIndex</Indexing>
 							<FullTextSearch>Use</FullTextSearch>
+							<DataHistory>Use</DataHistory>
 						</Properties>
 					</Attribute>
 					<Attribute uuid="7580cfcb-eadd-4bfe-8199-ce1c14867e10">
@@ -279,6 +286,7 @@
 							<ChoiceHistoryOnInput>Auto</ChoiceHistoryOnInput>
 							<Indexing>DontIndex</Indexing>
 							<FullTextSearch>Use</FullTextSearch>
+							<DataHistory>Use</DataHistory>
 						</Properties>
 					</Attribute>
 				</ChildObjects>
@@ -300,6 +308,7 @@
 					<ToolTip/>
 					<Picture/>
 					<Shortcut/>
+					<OnMainServerUnavalableBehavior>Auto</OnMainServerUnavalableBehavior>
 				</Properties>
 			</Command>
 		</ChildObjects>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260.xml"
index 6f9f9427c24..737b09ec892 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Form uuid="3b3346ea-1b32-4a2c-b3a6-1a9651659f0c">
 		<Properties>
 			<Name>ФормаВыбора</Name>
@@ -13,8 +13,8 @@
 			<FormType>Managed</FormType>
 			<IncludeHelpInContents>false</IncludeHelpInContents>
 			<UsePurposes>
-				<v8:Value xsi:type="app:ApplicationUsePurpose">PersonalComputer</v8:Value>
-				<v8:Value xsi:type="app:ApplicationUsePurpose">MobileDevice</v8:Value>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">PlatformApplication</v8:Value>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">MobilePlatformApplication</v8:Value>
 			</UsePurposes>
 		</Properties>
 	</Form>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form.xml"
index 6202649bcaf..0372c191190 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<WindowOpeningMode>LockOwnerWindow</WindowOpeningMode>
 	<AutoCommandBar name="" id="-1"/>
 	<ChildItems>
@@ -23,6 +23,7 @@
 			<UseAlternationRowColor>true</UseAlternationRowColor>
 			<InitialTreeView>ExpandTopLevel</InitialTreeView>
 			<EnableStartDrag>true</EnableStartDrag>
+			<FileDragMode>AsFile</FileDragMode>
 			<DataPath>Список</DataPath>
 			<RowPictureDataPath>Список.DefaultPicture</RowPictureDataPath>
 			<AutoRefresh>false</AutoRefresh>
@@ -144,8 +145,6 @@
 						<dcsset:viewMode>Normal</dcsset:viewMode>
 						<dcsset:userSettingID>b75fecce-942b-4aed-abc9-e6a02e460fb3</dcsset:userSettingID>
 					</dcsset:conditionalAppearance>
-					<dcsset:itemsViewMode>Normal</dcsset:itemsViewMode>
-					<dcsset:itemsUserSettingID>911b6018-f537-43e8-a417-da56b22f9aec</dcsset:itemsUserSettingID>
 				</ListSettings>
 			</Settings>
 		</Attribute>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form/Module.bsl" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form/Module.bsl"
index 9346b751efd..53f90c0ae1c 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form/Module.bsl"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\222\321\213\320\261\320\276\321\200\320\260/Ext/Form/Module.bsl"
@@ -1,4 +1,4 @@
-
+
 
 &НаКлиенте
 Процедура ВнешнееСобытие(Источник, Событие, Данные)
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260.xml"
index 10e894ea42c..3a191ee8be4 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Form uuid="1feb8a5b-989e-440d-afe3-9472183c335c">
 		<Properties>
 			<Name>ФормаСписка</Name>
@@ -13,8 +13,8 @@
 			<FormType>Managed</FormType>
 			<IncludeHelpInContents>false</IncludeHelpInContents>
 			<UsePurposes>
-				<v8:Value xsi:type="app:ApplicationUsePurpose">PersonalComputer</v8:Value>
-				<v8:Value xsi:type="app:ApplicationUsePurpose">MobileDevice</v8:Value>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">PlatformApplication</v8:Value>
+				<v8:Value xsi:type="app:ApplicationUsePurpose">MobilePlatformApplication</v8:Value>
 			</UsePurposes>
 		</Properties>
 	</Form>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260/Ext/Form.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260/Ext/Form.xml"
index 7e5ed25c3df..5dfb799090a 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260/Ext/Form.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\241\320\277\320\270\321\201\320\272\320\260/Ext/Form.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<AutoCommandBar name="" id="-1"/>
 	<ChildItems>
 		<UsualGroup name="СписокКомпоновщикНастроекПользовательскиеНастройки" id="1">
@@ -21,6 +21,7 @@
 			<UseAlternationRowColor>true</UseAlternationRowColor>
 			<InitialTreeView>ExpandTopLevel</InitialTreeView>
 			<EnableStartDrag>true</EnableStartDrag>
+			<FileDragMode>AsFile</FileDragMode>
 			<DataPath>Список</DataPath>
 			<RowPictureDataPath>Список.DefaultPicture</RowPictureDataPath>
 			<AutoRefresh>false</AutoRefresh>
@@ -142,8 +143,6 @@
 						<dcsset:viewMode>Normal</dcsset:viewMode>
 						<dcsset:userSettingID>b75fecce-942b-4aed-abc9-e6a02e460fb3</dcsset:userSettingID>
 					</dcsset:conditionalAppearance>
-					<dcsset:itemsViewMode>Normal</dcsset:itemsViewMode>
-					<dcsset:itemsUserSettingID>911b6018-f537-43e8-a417-da56b22f9aec</dcsset:itemsUserSettingID>
 				</ListSettings>
 			</Settings>
 		</Attribute>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260.xml"
index fa87e95322a..605c7a56b4f 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Form uuid="f7c2e745-0aed-46a7-ab6e-576791d6acd7">
 		<Properties>
 			<Name>ФормаЭлемента</Name>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Ext/Form.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Ext/Form.xml"
index 4f9cc18865d..0916909bfa1 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Ext/Form.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Forms/\320\244\320\276\321\200\320\274\320\260\320\255\320\273\320\265\320\274\320\265\320\275\321\202\320\260/Ext/Form.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<Form xmlns="http://v8.1c.ru/8.3/xcf/logform" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:dcscor="http://v8.1c.ru/8.1/data-composition-system/core" xmlns:dcsset="http://v8.1c.ru/8.1/data-composition-system/settings" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<WindowOpeningMode>LockOwnerWindow</WindowOpeningMode>
 	<UseForFoldersAndItems>Items</UseForFoldersAndItems>
 	<AutoCommandBar name="ФормаКоманднаяПанель" id="-1"/>
diff --git "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Templates/\320\234\320\260\320\272\320\265\321\202.xml" "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Templates/\320\234\320\260\320\272\320\265\321\202.xml"
index 5c3bc8d9dee..ad77dfe09a4 100644
--- "a/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Templates/\320\234\320\260\320\272\320\265\321\202.xml"
+++ "b/src/test/resources/metadata/Catalogs/\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721/Templates/\320\234\320\260\320\272\320\265\321\202.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Template uuid="42def71b-52cc-4e34-8a08-82f0dfcd47bf">
 		<Properties>
 			<Name>Макет</Name>
diff --git "a/src/test/resources/metadata/CommandGroups/\320\223\321\200\321\203\320\277\320\277\320\260\320\232\320\276\320\274\320\260\320\275\320\2641.xml" "b/src/test/resources/metadata/CommandGroups/\320\223\321\200\321\203\320\277\320\277\320\260\320\232\320\276\320\274\320\260\320\275\320\2641.xml"
new file mode 100644
index 00000000000..c8c524300fd
--- /dev/null
+++ "b/src/test/resources/metadata/CommandGroups/\320\223\321\200\321\203\320\277\320\277\320\260\320\232\320\276\320\274\320\260\320\275\320\2641.xml"
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
+	<CommandGroup uuid="ac39b903-0c60-417e-a50f-49ed375424f5">
+		<Properties>
+			<Name>ГруппаКоманд1</Name>
+			<Synonym>
+				<v8:item>
+					<v8:lang>ru</v8:lang>
+					<v8:content>Группа команд1</v8:content>
+				</v8:item>
+			</Synonym>
+			<Comment/>
+			<Representation>Auto</Representation>
+			<ToolTip>
+				<v8:item>
+					<v8:lang>ru</v8:lang>
+					<v8:content>Печать</v8:content>
+				</v8:item>
+			</ToolTip>
+			<Picture>
+				<xr:Ref>StdPicture.Print</xr:Ref>
+				<xr:LoadTransparent>true</xr:LoadTransparent>
+			</Picture>
+			<Category>FormCommandBar</Category>
+		</Properties>
+	</CommandGroup>
+</MetaDataObject>
\ No newline at end of file
diff --git "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.xml" "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.xml"
index 6b5f038792f..a4546ddc1e0 100644
--- "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.xml"
+++ "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<CommonModule uuid="90fca572-d17c-40c6-baad-9a28bd370cfc">
 		<Properties>
 			<Name>ПервыйОбщийМодуль</Name>
diff --git "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl" "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
index b91677cafa7..ff08e73dab6 100644
--- "a/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
+++ "b/src/test/resources/metadata/CommonModules/\320\237\320\265\321\200\320\262\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214/Ext/Module.bsl"
@@ -5,8 +5,8 @@
 
 #Область ОписаниеПеременных
 
-Перем ВалютаУчета;
-Перем АдресПоддержки;
+
+
 
 #КонецОбласти
 
@@ -55,6 +55,26 @@
 Функция Тест() КонецФункции
 #КонецОбласти
 
+Процедура НеУстаревшаяПроцедура() Экспорт
+
+КонецПроцедуры
+
+// Процедура - Устаревшая процедура
+// Устарела. См. НеУстаревшаяПроцедура.
+Процедура УстаревшаяПроцедура() Экспорт
+
+КонецПроцедуры
+
+Функция НеУстаревшаяФункция() Экспорт
+
+КонецФункции
+
+// Функция - Устаревшая функция
+// Устарела. См. НеУстаревшаяФункция.
+Функция УстаревшаяФункция() Экспорт
+
+КонецФункции
+
 #Region Initialize
 
 // SupportEmail = "v8@1c.ru";
diff --git a/src/test/resources/metadata/ConfigDumpInfo.xml b/src/test/resources/metadata/ConfigDumpInfo.xml
index 06ed5d6c0f3..e7b07515d41 100644
--- a/src/test/resources/metadata/ConfigDumpInfo.xml
+++ b/src/test/resources/metadata/ConfigDumpInfo.xml
@@ -1,18 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ConfigDumpInfo xmlns="http://v8.1c.ru/8.3/xcf/dumpinfo" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" format="Hierarchical" version="2.6">
+<ConfigDumpInfo xmlns="http://v8.1c.ru/8.3/xcf/dumpinfo" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" format="Hierarchical" version="2.10">
 	<ConfigVersions>
-		<Metadata name="Catalog.Справочник1" id="005c0536-aea1-4625-aa3f-02e8e8284e4a" configVersion="a7e20a157db7564b9c300de2cf6d8f3200000000"/>
-		<Metadata name="Catalog.Справочник1.Form.ФормаЭлемента" id="f7c2e745-0aed-46a7-ab6e-576791d6acd7" configVersion="8040c97e20103847ba9066dcf5ce0e0600000000"/>
-		<Metadata name="Catalog.Справочник1.Form.ФормаЭлемента.Form" id="f7c2e745-0aed-46a7-ab6e-576791d6acd7.0" configVersion="70e3e574174a4d4c8014cfe704deaec800000000"/>
-		<Metadata name="Catalog.Справочник1.ManagerModule" id="005c0536-aea1-4625-aa3f-02e8e8284e4a.3" configVersion="c6fa900326510b48aea808d4b727002200000000"/>
-		<Metadata name="Catalog.Справочник1.ObjectModule" id="005c0536-aea1-4625-aa3f-02e8e8284e4a.0" configVersion="449544185c47e148b7f6a7b77bbeb08100000000"/>
-		<Metadata name="CommonModule.ПервыйОбщийМодуль" id="90fca572-d17c-40c6-baad-9a28bd370cfc" configVersion="c9f5c23527803b4ba5f56b6f682ee0f900000000"/>
-		<Metadata name="CommonModule.ПервыйОбщийМодуль.Module" id="90fca572-d17c-40c6-baad-9a28bd370cfc.0" configVersion="5149936e6e44ba45827a123ead8a94e100000000"/>
-		<Metadata name="Configuration.Конфигурация" id="66129db7-a6d9-4860-ba20-0e61f65ace6f" configVersion="847e694c610cc4429fdf4f9b0ef391f500000000"/>
-		<Metadata name="InformationRegister.РегистрСведений1" id="59f8d329-f39c-4999-b470-ae9fc74511ac" configVersion="b2f031e296a9f048bff7784c2f8af0ae00000000">
+		<Metadata name="Catalog.Справочник1" id="eeef463d-d5e7-42f2-ae53-10279661f59d" configVersion="37e496796ffd714ea56c2ae445168fc500000000">
+			<Metadata name="Catalog.Справочник1.Command.Команда1" id="342ec3c7-82d4-42bb-a5ff-8a756f110744"/>
+			<Metadata name="Catalog.Справочник1.TabularSection.ТабличнаяЧасть1" id="451202c5-b1af-4bce-a705-0b5570071588"/>
+			<Metadata name="Catalog.Справочник1.TabularSection.ТабличнаяЧасть1.Attribute.Реквизит1" id="5e4add7a-846d-4242-a919-97dabde8d54b"/>
+			<Metadata name="Catalog.Справочник1.TabularSection.ТабличнаяЧасть1.Attribute.Реквизит2" id="7580cfcb-eadd-4bfe-8199-ce1c14867e10"/>
+			<Metadata name="Catalog.Справочник1.Attribute.Реквизит2" id="dff5b5d8-762d-4490-a336-dcc8d93c17d5"/>
+			<Metadata name="Catalog.Справочник1.Attribute.Реквизит3" id="ecd3c57a-75c8-474c-9c48-ac4c3831ab15"/>
+			<Metadata name="Catalog.Справочник1.Attribute.Реквизит1" id="f4b6bb58-962f-4811-809c-84514f07f16d"/>
+		</Metadata>
+		<Metadata name="Catalog.Справочник1.Command.Команда1.CommandModule" id="342ec3c7-82d4-42bb-a5ff-8a756f110744.2" configVersion="1495f9569edc6744a0212115806af12400000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаВыбора" id="3b3346ea-1b32-4a2c-b3a6-1a9651659f0c" configVersion="9ef5ab451766ee4dbf9d69ea8b89839700000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаВыбора.Form" id="3b3346ea-1b32-4a2c-b3a6-1a9651659f0c.0" configVersion="0c095d77aa96b844bf519b60e23fa48c00000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаСписка" id="1feb8a5b-989e-440d-afe3-9472183c335c" configVersion="6c6cfbc7a96b2b46bff449fd38c55c0c00000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаСписка.Form" id="1feb8a5b-989e-440d-afe3-9472183c335c.0" configVersion="9fef7ee688de5a4d955a231b4b08a79a00000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаЭлемента" id="f7c2e745-0aed-46a7-ab6e-576791d6acd7" configVersion="2e373c93022ce347ae5c055a8b6c32fc00000000"/>
+		<Metadata name="Catalog.Справочник1.Form.ФормаЭлемента.Form" id="f7c2e745-0aed-46a7-ab6e-576791d6acd7.0" configVersion="57edea98ef17114fbed1380eab7beb2a00000000"/>
+		<Metadata name="Catalog.Справочник1.ManagerModule" id="eeef463d-d5e7-42f2-ae53-10279661f59d.3" configVersion="141f55b2922ad94db07253f9e48f9e6400000000"/>
+		<Metadata name="Catalog.Справочник1.ObjectModule" id="eeef463d-d5e7-42f2-ae53-10279661f59d.0" configVersion="4c673cbcc160d14f819893aff9ab39b100000000"/>
+		<Metadata name="Catalog.Справочник1.Template.Макет" id="42def71b-52cc-4e34-8a08-82f0dfcd47bf" configVersion="79a4ce46681b374db93d4844cb4f837300000000"/>
+		<Metadata name="CommandGroup.ГруппаКоманд1" id="ac39b903-0c60-417e-a50f-49ed375424f5" configVersion="173cac8a93c98240bfbaafa85268a58b00000000"/>
+		<Metadata name="CommonModule.ПервыйОбщийМодуль" id="90fca572-d17c-40c6-baad-9a28bd370cfc" configVersion="635c3e687795a64a86b704b6279817c100000000"/>
+		<Metadata name="CommonModule.ПервыйОбщийМодуль.Module" id="90fca572-d17c-40c6-baad-9a28bd370cfc.0" configVersion="4e25522158b13a49a7ea9fff64f6afa500000000"/>
+		<Metadata name="Configuration.Конфигурация" id="66129db7-a6d9-4860-ba20-0e61f65ace6f" configVersion="a1cb42a6e86cde4fb42b1c3b8b646c4f00000000"/>
+		<Metadata name="Configuration.Конфигурация.ExternalConnectionModule" id="4b48cd27-5543-461e-a909-5265967c046d.5" configVersion="96ba0b3e3770b34bbca5e2f87f2dd5b300000000"/>
+		<Metadata name="Configuration.Конфигурация.ManagedApplicationModule" id="4b48cd27-5543-461e-a909-5265967c046d.6" configVersion="db81311cbee71e489773eef116b0f9a800000000"/>
+		<Metadata name="Configuration.Конфигурация.SessionModule" id="4b48cd27-5543-461e-a909-5265967c046d.7" configVersion="45c095cc1c6c6844a74de349296d2e8800000000"/>
+		<Metadata name="InformationRegister.РегистрСведений1" id="59f8d329-f39c-4999-b470-ae9fc74511ac" configVersion="38560804ca8ca645a044aab93f9d116400000000">
 			<Metadata name="InformationRegister.РегистрСведений1.Dimension.Справочник1" id="532f2a7f-4c1e-4a49-8281-3c21232da2d7"/>
 		</Metadata>
-		<Metadata name="InformationRegister.РегистрСведений1.RecordSetModule" id="59f8d329-f39c-4999-b470-ae9fc74511ac.1" configVersion="f50aed28f5b8924baf0ad4ede96883d900000000"/>
-		<Metadata name="Language.Русский" id="25fc0fbb-4f5a-4c96-b67b-21cda9c17a1d" configVersion="a60bcd0f951cab4486c5e255cefd1a9000000000"/>
+		<Metadata name="InformationRegister.РегистрСведений1.ManagerModule" id="59f8d329-f39c-4999-b470-ae9fc74511ac.2" configVersion="0ba9d1ee3cbe19408d6eaa7bb3bb3d7300000000"/>
+		<Metadata name="InformationRegister.РегистрСведений1.RecordSetModule" id="59f8d329-f39c-4999-b470-ae9fc74511ac.1" configVersion="d0c5f3d1ee2889498712f67da30684ed00000000"/>
+		<Metadata name="Language.Русский" id="25fc0fbb-4f5a-4c96-b67b-21cda9c17a1d" configVersion="e5043973a1c3fb4c8624a7378f58095f00000000"/>
 	</ConfigVersions>
 </ConfigDumpInfo>
\ No newline at end of file
diff --git a/src/test/resources/metadata/Configuration.xml b/src/test/resources/metadata/Configuration.xml
index e4e51e64eaa..7fb0c607ef7 100644
--- a/src/test/resources/metadata/Configuration.xml
+++ b/src/test/resources/metadata/Configuration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Configuration uuid="66129db7-a6d9-4860-ba20-0e61f65ace6f">
 		<InternalInfo>
 			<xr:ContainedObject>
@@ -10,6 +10,10 @@
 				<xr:ClassId>9fcd25a0-4822-11d4-9414-008048da11f9</xr:ClassId>
 				<xr:ObjectId>db32fc14-c00e-4aab-9461-659e271f4847</xr:ObjectId>
 			</xr:ContainedObject>
+			<xr:ContainedObject>
+				<xr:ClassId>e68182ea-4237-4383-967f-90c1e3370bc7</xr:ClassId>
+				<xr:ObjectId>d7e07abf-f10b-46ba-93a7-ba165e737ca9</xr:ObjectId>
+			</xr:ContainedObject>
 			<xr:ContainedObject>
 				<xr:ClassId>e3687481-0a87-462c-a166-9f34594f9bba</xr:ClassId>
 				<xr:ObjectId>e64be0bd-cdbf-43b4-9157-c511916ca0cd</xr:ObjectId>
@@ -23,8 +27,8 @@
 				<xr:ObjectId>3a683c7f-d5d4-446a-b82e-605622d99228</xr:ObjectId>
 			</xr:ContainedObject>
 			<xr:ContainedObject>
-				<xr:ClassId>e68182ea-4237-4383-967f-90c1e3370bc7</xr:ClassId>
-				<xr:ObjectId>d7e07abf-f10b-46ba-93a7-ba165e737ca9</xr:ObjectId>
+				<xr:ClassId>fb282519-d103-4dd3-bc12-cb271d631dfc</xr:ClassId>
+				<xr:ObjectId>a48aab26-e2c7-4a88-ba6a-32e3791888dd</xr:ObjectId>
 			</xr:ContainedObject>
 		</InternalInfo>
 		<Properties>
@@ -32,7 +36,7 @@
 			<Synonym/>
 			<Comment/>
 			<NamePrefix/>
-			<ConfigurationExtensionCompatibilityMode>Version8_3_12</ConfigurationExtensionCompatibilityMode>
+			<ConfigurationExtensionCompatibilityMode>Version8_3_17</ConfigurationExtensionCompatibilityMode>
 			<DefaultRunMode>ManagedApplication</DefaultRunMode>
 			<UsePurposes>
 				<v8:Value xsi:type="app:ApplicationUsePurpose">PlatformApplication</v8:Value>
@@ -57,60 +61,109 @@
 			<DefaultReportSettingsForm/>
 			<DefaultDynamicListSettingsForm/>
 			<DefaultSearchForm/>
+			<DefaultDataHistoryChangeHistoryForm/>
+			<DefaultDataHistoryVersionDataForm/>
+			<DefaultDataHistoryVersionDifferencesForm/>
+			<DefaultCollaborationSystemUsersChoiceForm/>
 			<RequiredMobileApplicationPermissions>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Multimedia</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Location</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Contacts</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Calendars</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Telephony</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">PushNotification</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">LocalNotification</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Print</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">InAppPurchases</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">Ads</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">BackgroundLocation</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">BackgroundAudioPlayback</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
-				<v8:pair>
-					<v8:Key xsi:type="app:RequiredMobileApplicationPermissions">FileExchangeWithPersonalComputer</v8:Key>
-					<v8:Value xsi:type="xs:boolean">false</v8:Value>
-				</v8:pair>
+				<app:permission>
+					<app:permission>Location</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Contacts</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Calendars</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>PushNotification</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>LocalNotification</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Print</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>InAppPurchases</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Ads</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>BackgroundLocation</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>BackgroundAudioPlayback</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>FileExchangeWithPersonalComputer</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>CallPhone</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>CallLog</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>HandlePhoneCalls</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>SendSMS</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>ReceiveSMS</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>SMSLog</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Camera</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>Microphone</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>MusicLibrary</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>PicturesAndVideoLibraries</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>AudioAndVibrationPlayback</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>InstallPackages</app:permission>
+					<app:use>false</app:use>
+				</app:permission>
+				<app:permission>
+					<app:permission>AllowOSBackup</app:permission>
+					<app:use>true</app:use>
+				</app:permission>
 			</RequiredMobileApplicationPermissions>
+			<StandaloneConfigurationRestrictionRoles/>
 			<MainClientApplicationWindowMode>Normal</MainClientApplicationWindowMode>
 			<DefaultInterface/>
 			<DefaultStyle/>
@@ -131,6 +184,7 @@
 		<ChildObjects>
 			<Language>Русский</Language>
 			<CommonModule>ПервыйОбщийМодуль</CommonModule>
+			<CommandGroup>ГруппаКоманд1</CommandGroup>
 			<Catalog>Справочник1</Catalog>
 			<InformationRegister>РегистрСведений1</InformationRegister>
 		</ChildObjects>
diff --git "a/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.xml" "b/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.xml"
index 9f3384db80e..019abb13e3a 100644
--- "a/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.xml"
+++ "b/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<InformationRegister uuid="59f8d329-f39c-4999-b470-ae9fc74511ac">
 		<InternalInfo>
 			<xr:GeneratedType name="InformationRegisterRecord.РегистрСведений1" category="Record">
@@ -55,6 +55,8 @@
 			<ExtendedListPresentation/>
 			<Explanation/>
 			<DataHistory>DontUse</DataHistory>
+			<UpdateDataHistoryImmediatelyAfterWrite>false</UpdateDataHistoryImmediatelyAfterWrite>
+			<ExecuteAfterWriteDataHistoryVersionProcessing>false</ExecuteAfterWriteDataHistoryVersionProcessing>
 		</Properties>
 		<ChildObjects>
 			<Dimension uuid="532f2a7f-4c1e-4a49-8281-3c21232da2d7">
diff --git "a/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711/Ext/ManagerModule.bsl" "b/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711/Ext/ManagerModule.bsl"
new file mode 100644
index 00000000000..b9286474110
--- /dev/null
+++ "b/src/test/resources/metadata/InformationRegisters/\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711/Ext/ManagerModule.bsl"
@@ -0,0 +1,19 @@
+Процедура НеУстаревшаяПроцедура() Экспорт
+
+КонецПроцедуры
+
+// Процедура - Устаревшая процедура
+// Устарела. См. НеУстаревшаяПроцедура.
+Процедура УстаревшаяПроцедура() Экспорт
+
+КонецПроцедуры
+
+Функция НеУстаревшаяФункция() Экспорт
+
+КонецФункции
+
+// Функция - Устаревшая функция
+// Устарела. См. НеУстаревшаяФункция.
+Функция УстаревшаяФункция() Экспорт
+
+КонецФункции
diff --git "a/src/test/resources/metadata/Languages/\320\240\321\203\321\201\321\201\320\272\320\270\320\271.xml" "b/src/test/resources/metadata/Languages/\320\240\321\203\321\201\321\201\320\272\320\270\320\271.xml"
index ab821111421..50f3151bf00 100644
--- "a/src/test/resources/metadata/Languages/\320\240\321\203\321\201\321\201\320\272\320\270\320\271.xml"
+++ "b/src/test/resources/metadata/Languages/\320\240\321\203\321\201\321\201\320\272\320\270\320\271.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.6">
+<MetaDataObject xmlns="http://v8.1c.ru/8.3/MDClasses" xmlns:app="http://v8.1c.ru/8.2/managed-application/core" xmlns:cfg="http://v8.1c.ru/8.1/data/enterprise/current-config" xmlns:cmi="http://v8.1c.ru/8.2/managed-application/cmi" xmlns:ent="http://v8.1c.ru/8.1/data/enterprise" xmlns:lf="http://v8.1c.ru/8.2/managed-application/logform" xmlns:style="http://v8.1c.ru/8.1/data/ui/style" xmlns:sys="http://v8.1c.ru/8.1/data/ui/fonts/system" xmlns:v8="http://v8.1c.ru/8.1/data/core" xmlns:v8ui="http://v8.1c.ru/8.1/data/ui" xmlns:web="http://v8.1c.ru/8.1/data/ui/colors/web" xmlns:win="http://v8.1c.ru/8.1/data/ui/colors/windows" xmlns:xen="http://v8.1c.ru/8.3/xcf/enums" xmlns:xpr="http://v8.1c.ru/8.3/xcf/predef" xmlns:xr="http://v8.1c.ru/8.3/xcf/readable" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.10">
 	<Language uuid="25fc0fbb-4f5a-4c96-b67b-21cda9c17a1d">
 		<Properties>
 			<Name>Русский</Name>

From 4ce31c997a98cc3ee45d5eb8f545f12acf26eb14 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 19 May 2020 18:14:01 +0300
Subject: [PATCH 322/444] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=BD=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81=D1=82=20=D0=B2=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?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/AbstractDiagnosticTest.java     | 13 ++++++++++++-
 .../bsl/languageserver/util/TestUtils.java      | 17 ++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
index faf83ef5ee8..3d86aecf5d2 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java
@@ -23,7 +23,9 @@
 
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
+import com.github._1c_syntax.utils.Absolute;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.lsp4j.CodeAction;
@@ -34,6 +36,7 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 
+import javax.annotation.Nullable;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
@@ -41,6 +44,8 @@
 abstract class AbstractDiagnosticTest<T extends BSLDiagnostic> {
 
   protected final T diagnosticInstance;
+  @Nullable
+  protected ServerContext context;
 
   @SuppressWarnings("unchecked")
   AbstractDiagnosticTest(Class<T> diagnosticClass) {
@@ -48,6 +53,12 @@ abstract class AbstractDiagnosticTest<T extends BSLDiagnostic> {
     diagnosticInstance = (T) diagnosticSupplier.getDiagnosticInstance(diagnosticClass);
   }
 
+  protected void initServerContext(String path) {
+    var configurationRoot = Absolute.path(path);
+    context = new ServerContext(configurationRoot);
+    context.populateContext();
+  }
+
   protected List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
     return diagnosticInstance.getDiagnostics(documentContext);
   }
@@ -106,7 +117,7 @@ protected DocumentContext getDocumentContext() {
   protected DocumentContext getDocumentContext(String SimpleFileName) {
     String textDocumentContent = getText(SimpleFileName);
 
-    return TestUtils.getDocumentContext(textDocumentContent);
+    return TestUtils.getDocumentContext(textDocumentContent, context);
   }
 
   protected String getText() {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/TestUtils.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/TestUtils.java
index f2c2a8a46a2..25e7e5ea0a9 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/TestUtils.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/util/TestUtils.java
@@ -27,6 +27,7 @@
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -35,6 +36,7 @@
 public class TestUtils {
 
   public static final URI FAKE_DOCUMENT_URI = Absolute.uri("file:///fake-uri.bsl");
+  public static final String PATH_TO_METADATA = "src/test/resources/metadata";
 
   @SneakyThrows
   public static DocumentContext getDocumentContextFromFile(String filePath) {
@@ -48,10 +50,23 @@ public static DocumentContext getDocumentContextFromFile(String filePath) {
   }
 
   public static DocumentContext getDocumentContext(URI uri, String fileContent) {
-    return new DocumentContext(uri, fileContent, new ServerContext());
+    return getDocumentContext(uri, fileContent, new ServerContext());
   }
 
   public static DocumentContext getDocumentContext(String fileContent) {
     return getDocumentContext(FAKE_DOCUMENT_URI, fileContent);
   }
+
+  public static DocumentContext getDocumentContext(String fileContent, @Nullable ServerContext context) {
+    ServerContext passedContext = context;
+    if (passedContext == null) {
+      passedContext = new ServerContext();
+    }
+
+    return getDocumentContext(FAKE_DOCUMENT_URI, fileContent, passedContext);
+  }
+
+  public static DocumentContext getDocumentContext(URI uri, String fileContent, ServerContext context) {
+    return context.addDocument(uri, fileContent);
+  }
 }

From 9c94474f9773ae57dee0cccc2cf6613e4c0a403f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 19 May 2020 18:14:29 +0300
Subject: [PATCH 323/444] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20?=
 =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B8=D1=85=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../languageserver/context/ServerContext.java |  3 +-
 .../DeprecatedMethodCallDiagnostic.java       | 55 ++++++++++++++-----
 .../languageserver/utils/MdoRefBuilder.java   | 44 ++++++++++-----
 .../DeprecatedMethodCallDiagnosticTest.java   | 11 +++-
 4 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index f77949f8049..f5ab8e77919 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -111,9 +111,8 @@ public DocumentContext getDocument(URI uri) {
     return documents.get(Absolute.uri(uri));
   }
 
-  @CheckForNull
   public Map<ModuleType, DocumentContext> getDocuments(String mdoRef) {
-    return documentsByMDORef.get(mdoRef);
+    return documentsByMDORef.getOrDefault(mdoRef, Collections.emptyMap());
   }
 
   @SneakyThrows
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index 5edc85f6a18..011e08b1fb5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -33,6 +33,7 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import javax.annotation.CheckForNull;
+import java.util.List;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -52,25 +53,42 @@ public DeprecatedMethodCallDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
 
-    if (ctx.globalMethodCall() != null) {
-      return super.visitCallStatement(ctx);
-    }
-
     String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
     if (mdoRef.isEmpty()) {
       return super.visitCallStatement(ctx);
     }
 
-    var documentContexts = documentContext.getServerContext().getDocuments(mdoRef);
-    if (documentContexts == null) {
+    Token methodName = getMethodName(ctx);
+    if (methodName == null) {
       return super.visitCallStatement(ctx);
     }
 
+    checkDeprecatedCall(mdoRef, methodName);
+
+    return super.visitCallStatement(ctx);
+  }
+
+
+  @Override
+  public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx) {
+
+    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
+    if (mdoRef.isEmpty()) {
+      return super.visitComplexIdentifier(ctx);
+    }
+
     Token methodName = getMethodName(ctx);
     if (methodName == null) {
-      return super.visitCallStatement(ctx);
+      return super.visitComplexIdentifier(ctx);
     }
 
+    checkDeprecatedCall(mdoRef, methodName);
+
+    return super.visitComplexIdentifier(ctx);
+  }
+
+  private void checkDeprecatedCall(String mdoRef, Token methodName) {
+    var documentContexts = documentContext.getServerContext().getDocuments(mdoRef);
     String methodNameText = methodName.getText();
 
     documentContexts.values().stream()
@@ -80,17 +98,28 @@ public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
         && methodSymbol.getName().equalsIgnoreCase(methodNameText))
       .findAny()
       .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
-
-    return super.visitCallStatement(ctx);
   }
 
-  @CheckForNull
   private static Token getMethodName(BSLParser.CallStatementContext ctx) {
-
     var modifiers = ctx.modifier();
     if (modifiers.isEmpty()) {
       return getMethodName(ctx.accessCall());
     } else {
+      return getMethodName(modifiers);
+    }
+  }
+
+  private static Token getMethodName(BSLParser.AccessCallContext ctx) {
+    return ctx.methodCall().methodName().getStart();
+  }
+
+  private static Token getMethodName(BSLParser.ComplexIdentifierContext ctx) {
+    return getMethodName(ctx.modifier());
+  }
+
+  @CheckForNull
+  private static Token getMethodName(List<? extends BSLParser.ModifierContext> modifiers) {
+    if (!modifiers.isEmpty()) {
       // пока только общие модули
       BSLParser.ModifierContext firstModifier = modifiers.get(0);
       if (firstModifier.accessCall() != null) {
@@ -100,8 +129,4 @@ private static Token getMethodName(BSLParser.CallStatementContext ctx) {
 
     return null;
   }
-
-  private static Token getMethodName(BSLParser.AccessCallContext ctx) {
-    return ctx.methodCall().methodName().getStart();
-  }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
index 7158b29b826..c70a4d05569 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
@@ -23,25 +23,43 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 import lombok.experimental.UtilityClass;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
 
 @UtilityClass
 public class MdoRefBuilder {
 
   public String getMdoRef(DocumentContext documentContext, BSLParser.CallStatementContext callStatement) {
-    String mdoRef = "";
-
-    if (callStatement.IDENTIFIER() != null) {
-      var commonModuleName = callStatement.IDENTIFIER().getText();
-      var commonModule = documentContext.getServerContext()
-        .getConfiguration()
-        .getCommonModule(commonModuleName);
-      if (commonModule.isPresent()) {
-        mdoRef = commonModule.orElseThrow().getMdoRef();
-      }
-    }
-
-    return mdoRef;
+    AtomicReference<String> mdoRef = new AtomicReference<>("");
+
+    Optional.ofNullable(callStatement.IDENTIFIER())
+      .map(ParseTree::getText)
+      .flatMap(commonModuleName -> getCommonModuleMdoRef(documentContext, commonModuleName))
+      .ifPresent(mdoRef::set);
+
+    return mdoRef.get();
+  }
+
+  public String getMdoRef(DocumentContext documentContext, BSLParser.ComplexIdentifierContext complexIdentifier) {
+    AtomicReference<String> mdoRef = new AtomicReference<>("");
+
+    Optional.ofNullable(complexIdentifier.IDENTIFIER())
+      .map(ParseTree::getText)
+      .flatMap(commonModuleName -> getCommonModuleMdoRef(documentContext, commonModuleName))
+      .ifPresent(mdoRef::set);
+
+    return mdoRef.get();
+  }
+
+  private Optional<String> getCommonModuleMdoRef(DocumentContext documentContext, String commonModuleName) {
+    return documentContext.getServerContext()
+      .getConfiguration()
+      .getCommonModule(commonModuleName)
+      .map(CommonModule::getMdoRef);
   }
 
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
index 6ea1ff1ade8..fea0afbdcd2 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+import static com.github._1c_syntax.bsl.languageserver.util.TestUtils.PATH_TO_METADATA;
 
 class DeprecatedMethodCallDiagnosticTest extends AbstractDiagnosticTest<DeprecatedMethodCallDiagnostic> {
   DeprecatedMethodCallDiagnosticTest() {
@@ -36,11 +37,17 @@ class DeprecatedMethodCallDiagnosticTest extends AbstractDiagnosticTest<Deprecat
   @Test
   void test() {
 
+    initServerContext(PATH_TO_METADATA);
+
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(1);
+    assertThat(diagnostics).hasSize(4);
     assertThat(diagnostics, true)
-      .hasRange(6, 0, 6, 20);
+      .hasRange(1, 18, 1, 37)
+      .hasRange(4, 18, 4, 35)
+      .hasRange(7, 22, 7, 39)
+      .hasRange(10, 23, 10, 40)
+    ;
 
   }
 }

From daec2868226ed6006e9925a5abfa52c1eb9c458c Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 20 May 2020 01:10:49 +0300
Subject: [PATCH 324/444] Update faq.md

---
 docs/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 9212686f81a..77c9ec728a2 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -28,7 +28,7 @@
 `BSL Language Server` может быть использован с любым приложением, имеющим реализацию LSP клиента. Проверенные подключения:
 * плагин для [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/);
 * дополнительная утилита для Конфигуратора [Phoenix BSL](https://github.com/otymko/phoenixbsl);
-* плагин для Sublime Text [https://github.com/sublimelsp/LSP].
+* плагин для [Sublime Text](https://github.com/sublimelsp/LSP).
 
 Так же через прямой импорт `BSL Language Server` работают:
 * плагин для [1C:Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (собственная реализация, без LSP);

From e3052a9fd97576d4c5e72b33ada3de047440c15a Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 13:39:58 +0300
Subject: [PATCH 325/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BD=D1=83=D0=BC=D0=B5=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B2=20faq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 77c9ec728a2..4e5de94d9a7 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -2,26 +2,26 @@
 
 В данном разделе собраны наиболее часто возникающие вопросы и ответы на них.
 
-1. Как изменить язык диагностических сообщений?
+## Как изменить язык диагностических сообщений?
 
 Для изменения языка выводимых сообщений с русского (по умолчанию) на английский можно с помощью конфигурационного файла. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
 
-2. Как увеличить максимальную длину строки в диагностике `Ограничение на длину строки`?
+## Как увеличить максимальную длину строки в диагностике `Ограничение на длину строки`?
 
 Все диагностики имеет страницу с описанием в разделе `Диагностики`, например интересующая [Ограничение на длину строки](diagnostics/LineLength.md). Если диагностика может менять свое поведение, то на странице с описанием будут присутствовать параметры с описанием, на что они влияют. В данном случае - параметр `maxLineLength` как раз и отвечает за максимальную длину строки.
 
-3. Как отключить Lens о когнитивной диагностики?
+## Как отключить Lens о когнитивной диагностики?
 
 Для отключения `линзы` с информацией о когнитивной сложности стоит воспользоваться конфигурационным файлом, в котором для параметра `showCognitiveComplexity` установить значение `false`. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
 
-4. Я считаю, что диагностика работает неправильно. Что делать?
+## Я считаю, что диагностика работает неправильно. Что делать?
 
 В случае сомнения (или уверенности) в том, что диагностика работает неверно есть два пути
 
 - обратиться в чате [telegram](https://t.me/bsl_language_server) с ситуацией, возможно все-таки ошибки нет
 - создать ишью ([issue](https://github.com/1c-syntax/bsl-language-server/issues)) в репозитории проекта соответствующего типа, куда приложить описание ошибки и, очень желательно, примеры кода, где диагностика работает неверно.
 
-5. `BSL Language Server` и SonarQube плагин это одно и тоже?
+## `BSL Language Server` и SonarQube плагин это одно и тоже?
 
 `BSL Language Server` является самостоятельным приложением, реализацией серверной части протокола LSP. Плагин для SonarQube использует `BSL Language Server` для выполнения анализа исходного кода языка BSL (конфигурации 1С, скрипты 1Scipt и OSWeb).
 

From e8a943337cb2048833e99c2398609804ca72f7d9 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 20 May 2020 15:31:25 +0300
Subject: [PATCH 326/444] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6=D0=B5=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                              |  2 +-
 .../DeprecatedMethodCallDiagnostic.java       | 23 ++++----
 .../languageserver/utils/MdoRefBuilder.java   | 53 ++++++++++++++++---
 .../DeprecatedMethodCallDiagnosticTest.java   |  5 +-
 .../DeprecatedMethodCallDiagnostic.bsl        | 12 +++++
 5 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d9860190cf2..a7a87f27a09 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "4034e83681b")
-    implementation("com.github.1c-syntax", "mdclasses", "86be1579c4")
+    implementation("com.github.1c-syntax", "mdclasses", "3c230c235909b14e5e1a5678af54344ee3ed5330")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index 011e08b1fb5..1129925df2d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -34,6 +34,8 @@
 
 import javax.annotation.CheckForNull;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -102,10 +104,12 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
 
   private static Token getMethodName(BSLParser.CallStatementContext ctx) {
     var modifiers = ctx.modifier();
+    var methodName = getMethodName(ctx.accessCall());
+
     if (modifiers.isEmpty()) {
-      return getMethodName(ctx.accessCall());
+      return methodName;
     } else {
-      return getMethodName(modifiers);
+      return Optional.ofNullable(getMethodName(modifiers)).orElse(methodName);
     }
   }
 
@@ -119,14 +123,11 @@ private static Token getMethodName(BSLParser.ComplexIdentifierContext ctx) {
 
   @CheckForNull
   private static Token getMethodName(List<? extends BSLParser.ModifierContext> modifiers) {
-    if (!modifiers.isEmpty()) {
-      // пока только общие модули
-      BSLParser.ModifierContext firstModifier = modifiers.get(0);
-      if (firstModifier.accessCall() != null) {
-        return getMethodName(firstModifier.accessCall());
-      }
-    }
-
-    return null;
+    return modifiers.stream()
+      .map(BSLParser.ModifierContext::accessCall)
+      .filter(Objects::nonNull)
+      .map(DeprecatedMethodCallDiagnostic::getMethodName)
+      .findFirst()
+      .orElse(null);
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
index c70a4d05569..29bd1048dcb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
@@ -24,9 +24,16 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
+import com.github._1c_syntax.mdclasses.metadata.additional.MDOType;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.mdclasses.utils.Common;
 import lombok.experimental.UtilityClass;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
 
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -34,22 +41,35 @@
 public class MdoRefBuilder {
 
   public String getMdoRef(DocumentContext documentContext, BSLParser.CallStatementContext callStatement) {
-    AtomicReference<String> mdoRef = new AtomicReference<>("");
+    return getMdoRef(documentContext, callStatement.IDENTIFIER(), callStatement.modifier());
+  }
 
-    Optional.ofNullable(callStatement.IDENTIFIER())
-      .map(ParseTree::getText)
-      .flatMap(commonModuleName -> getCommonModuleMdoRef(documentContext, commonModuleName))
-      .ifPresent(mdoRef::set);
 
-    return mdoRef.get();
+  public String getMdoRef(DocumentContext documentContext, BSLParser.ComplexIdentifierContext complexIdentifier) {
+    return getMdoRef(documentContext, complexIdentifier.IDENTIFIER(), complexIdentifier.modifier());
   }
 
-  public String getMdoRef(DocumentContext documentContext, BSLParser.ComplexIdentifierContext complexIdentifier) {
+  public String getMdoRef(
+    DocumentContext documentContext,
+    @Nullable
+    TerminalNode identifier,
+    List<? extends BSLParser.ModifierContext> modifiers
+  ) {
+
     AtomicReference<String> mdoRef = new AtomicReference<>("");
 
-    Optional.ofNullable(complexIdentifier.IDENTIFIER())
+    Optional.ofNullable(identifier)
       .map(ParseTree::getText)
       .flatMap(commonModuleName -> getCommonModuleMdoRef(documentContext, commonModuleName))
+      .or(() ->
+        Optional.ofNullable(identifier)
+          .map(ParseTree::getText)
+          .flatMap(MDOType::fromValue)
+          .filter(mdoType -> Common.getModuleTypesForMdoTypes()
+            .getOrDefault(mdoType, Collections.emptySet())
+            .contains(ModuleType.ManagerModule))
+          .map(mdoType -> getMdoRef(mdoType, getMdoName(modifiers)))
+      )
       .ifPresent(mdoRef::set);
 
     return mdoRef.get();
@@ -62,4 +82,21 @@ private Optional<String> getCommonModuleMdoRef(DocumentContext documentContext,
       .map(CommonModule::getMdoRef);
   }
 
+  private String getMdoRef(MDOType mdoType, String identifier) {
+    if (identifier.isEmpty()) {
+      return "";
+    }
+
+    return mdoType.getName() + "." + identifier;
+  }
+
+  private String getMdoName(List<? extends BSLParser.ModifierContext> modifiers) {
+    return modifiers.stream()
+      .limit(1)
+      .findAny()
+      .map(BSLParser.ModifierContext::accessProperty)
+      .map(BSLParser.AccessPropertyContext::IDENTIFIER)
+      .map(ParseTree::getText)
+      .orElse("");
+  }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
index fea0afbdcd2..f5c91c4c42d 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
@@ -41,12 +41,15 @@ void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(4);
+    assertThat(diagnostics).hasSize(7);
     assertThat(diagnostics, true)
       .hasRange(1, 18, 1, 37)
       .hasRange(4, 18, 4, 35)
       .hasRange(7, 22, 7, 39)
       .hasRange(10, 23, 10, 40)
+      .hasRange(16, 34, 16, 53)
+      .hasRange(19, 38, 19, 55)
+      .hasRange(22, 39, 22, 56)
     ;
 
   }
diff --git a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
index 827d2cbf37f..11c03a727c6 100644
--- a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
@@ -13,3 +13,15 @@
 
 Если ПервыйОбщийМодуль.НеУстаревшаяФункция() Тогда
 КонецЕсли;
+
+РегистрыСведений.РегистрСведений1.УстаревшаяПроцедура();
+РегистрыСведений.РегистрСведений1.НеУстаревшаяПроцедура();
+
+А = РегистрыСведений.РегистрСведений1.УстаревшаяФункция();
+А = РегистрыСведений.РегистрСведений1.НеУстаревшаяФункция();
+
+Если РегистрыСведений.РегистрСведений1.УстаревшаяФункция() Тогда
+КонецЕсли;
+
+Если РегистрыСведений.РегистрСведений1.НеУстаревшаяФункция() Тогда
+КонецЕсли;
\ No newline at end of file

From 97ebdd7b2d7aa7e28dd5444fcf894f6710748668 Mon Sep 17 00:00:00 2001
From: Viktor Gukov <zchokobo@gmail.com>
Date: Wed, 20 May 2020 15:39:46 +0300
Subject: [PATCH 327/444] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=89=D0=B8=D1=85=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D0=B4=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=BF=D0=BE=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/contributing/StyleGuide.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/contributing/StyleGuide.md b/docs/contributing/StyleGuide.md
index 01d5a71ccfe..2125d8e7048 100644
--- a/docs/contributing/StyleGuide.md
+++ b/docs/contributing/StyleGuide.md
@@ -4,6 +4,10 @@
 
 Постарайтесь придерживаться их, и процесс ревью Вашего кода будет гладким и шелковистым (с).
 
+## Общие рекомендации
+
+Если метод на законных основаниях может возвращать null, следует возвращать Optional\<T>, вместо явного возврата null.
+
 ## Форматирование
 
 1. Весь код в модулях должен быть автоматически отформатирован.

From 8e48cbc9a2d1cd055b39feb0634d9314d7b50522 Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 14:45:31 +0300
Subject: [PATCH 328/444] =?UTF-8?q?=D1=81=D0=BD=D0=B8=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BF=D0=B8=D0=BF=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanonicalSpellingKeywordsDiagnostic.java  | 482 ++++--------------
 1 file changed, 87 insertions(+), 395 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 42f63ed8678..27da6d41d3e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -38,6 +38,7 @@
 import org.eclipse.lsp4j.TextEdit;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -70,401 +71,88 @@ private static Map<Integer, List<String>> getDefaultPreset() {
 
     Map<Integer, List<String>> result = new HashMap<>();
 
-    // IF_KEYWORD
-    List<String> ifKeywordSpelling = new ArrayList<>();
-    ifKeywordSpelling.add(Keywords.IF_RU);
-    ifKeywordSpelling.add(Keywords.IF_EN);
-    result.put(BSLParser.IF_KEYWORD, ifKeywordSpelling);
-
-    // THEN_KEYWORD
-    List<String> thenKeywordSpelling = new ArrayList<>();
-    thenKeywordSpelling.add(Keywords.THEN_RU);
-    thenKeywordSpelling.add(Keywords.THEN_EN);
-    result.put(BSLParser.THEN_KEYWORD, thenKeywordSpelling);
-
-    // ELSE_KEYWORD
-    List<String> elseKeywordSpelling = new ArrayList<>();
-    elseKeywordSpelling.add(Keywords.ELSE_RU);
-    elseKeywordSpelling.add(Keywords.ELSE_EN);
-    result.put(BSLParser.ELSE_KEYWORD, elseKeywordSpelling);
-
-    // ELSIF_KEYWORD
-    List<String> elsIfKeywordSpelling = new ArrayList<>();
-    elsIfKeywordSpelling.add(Keywords.ELSIF_RU);
-    elsIfKeywordSpelling.add(Keywords.ELSIF_EN);
-    result.put(BSLParser.ELSIF_KEYWORD, elsIfKeywordSpelling);
-
-    // ENDIF_KEYWORD
-    List<String> endIfKeywordSpelling = new ArrayList<>();
-    endIfKeywordSpelling.add(Keywords.ENDIF_RU);
-    endIfKeywordSpelling.add(Keywords.ENDIF_EN);
-    result.put(BSLParser.ENDIF_KEYWORD, endIfKeywordSpelling);
-
-    // FOR_KEYWORD
-    List<String> forKeywordSpelling = new ArrayList<>();
-    forKeywordSpelling.add(Keywords.FOR_RU);
-    forKeywordSpelling.add(Keywords.FOR_EN);
-    result.put(BSLParser.FOR_KEYWORD, forKeywordSpelling);
-
-    // EACH_KEYWORD
-    List<String> eachKeywordSpelling = new ArrayList<>();
-    eachKeywordSpelling.add(Keywords.EACH_RU);
-    eachKeywordSpelling.add(Keywords.EACH_LO_RU);
-    eachKeywordSpelling.add(Keywords.EACH_EN);
-    eachKeywordSpelling.add(Keywords.EACH_LO_EN);
-    result.put(BSLParser.EACH_KEYWORD, eachKeywordSpelling);
-
-    // IN_KEYWORD
-    List<String> inKeywordSpelling = new ArrayList<>();
-    inKeywordSpelling.add(Keywords.IN_RU);
-    inKeywordSpelling.add(Keywords.IN_EN);
-    result.put(BSLParser.IN_KEYWORD, inKeywordSpelling);
-
-    // DO_KEYWORD
-    List<String> doKeywordSpelling = new ArrayList<>();
-    doKeywordSpelling.add(Keywords.DO_RU);
-    doKeywordSpelling.add(Keywords.DO_EN);
-    result.put(BSLParser.DO_KEYWORD, doKeywordSpelling);
-
-    // WHILE_KEYWORD
-    List<String> whileKeywordSpelling = new ArrayList<>();
-    whileKeywordSpelling.add(Keywords.WHILE_RU);
-    whileKeywordSpelling.add(Keywords.WHILE_EN);
-    result.put(BSLParser.WHILE_KEYWORD, whileKeywordSpelling);
-
-    // BREAK_KEYWORD
-    List<String> breakKeywordSpelling = new ArrayList<>();
-    breakKeywordSpelling.add(Keywords.BREAK_RU);
-    breakKeywordSpelling.add(Keywords.BREAK_EN);
-    result.put(BSLParser.BREAK_KEYWORD, breakKeywordSpelling);
-
-    // CONTINUE_KEYWORD
-    List<String> continueKeywordSpelling = new ArrayList<>();
-    continueKeywordSpelling.add(Keywords.CONTINUE_RU);
-    continueKeywordSpelling.add(Keywords.CONTINUE_EN);
-    result.put(BSLParser.CONTINUE_KEYWORD, continueKeywordSpelling);
-
-    // ENDDO_KEYWORD
-    List<String> endDoKeywordSpelling = new ArrayList<>();
-    endDoKeywordSpelling.add(Keywords.END_DO_RU);
-    endDoKeywordSpelling.add(Keywords.END_DO_EN);
-    result.put(BSLParser.ENDDO_KEYWORD, endDoKeywordSpelling);
-
-    // TO_KEYWORD
-    List<String> toKeywordSpelling = new ArrayList<>();
-    toKeywordSpelling.add(Keywords.TO_RU);
-    toKeywordSpelling.add(Keywords.TO_EN);
-    result.put(BSLParser.TO_KEYWORD, toKeywordSpelling);
-
-    // PROCEDURE_KEYWORD
-    List<String> procedureKeywordSpelling = new ArrayList<>();
-    procedureKeywordSpelling.add(Keywords.PROCEDURE_RU);
-    procedureKeywordSpelling.add(Keywords.PROCEDURE_EN);
-    result.put(BSLParser.PROCEDURE_KEYWORD, procedureKeywordSpelling);
-
-    // VAL_KEYWORD
-    List<String> valKeywordSpelling = new ArrayList<>();
-    valKeywordSpelling.add(Keywords.VAL_RU);
-    valKeywordSpelling.add(Keywords.VAL_EN);
-    result.put(BSLParser.VAL_KEYWORD, valKeywordSpelling);
-
-    // EXPORT_KEYWORD
-    List<String> exportKeywordSpelling = new ArrayList<>();
-    exportKeywordSpelling.add(Keywords.EXPORT_RU);
-    exportKeywordSpelling.add(Keywords.EXPORT_EN);
-    result.put(BSLParser.EXPORT_KEYWORD, exportKeywordSpelling);
-
-    // VAR_KEYWORD
-    List<String> varKeywordSpelling = new ArrayList<>();
-    varKeywordSpelling.add(Keywords.VAR_RU);
-    varKeywordSpelling.add(Keywords.VAR_EN);
-    result.put(BSLParser.VAR_KEYWORD, varKeywordSpelling);
-
-    // TRY_KEYWORD
-    List<String> tryKeywordSpelling = new ArrayList<>();
-    tryKeywordSpelling.add(Keywords.TRY_RU);
-    tryKeywordSpelling.add(Keywords.TRY_EN);
-    result.put(BSLParser.TRY_KEYWORD, tryKeywordSpelling);
-
-    // EXECUTE_KEYWORD
-    List<String> executeKeywordSpelling = new ArrayList<>();
-    executeKeywordSpelling.add(Keywords.EXECUTE_RU);
-    executeKeywordSpelling.add(Keywords.EXECUTE_EN);
-    result.put(BSLParser.EXECUTE_KEYWORD, executeKeywordSpelling);
-
-    // RETURN_KEYWORD
-    List<String> returnKeywordSpelling = new ArrayList<>();
-    returnKeywordSpelling.add(Keywords.RETURN_RU);
-    returnKeywordSpelling.add(Keywords.RETURN_EN);
-    result.put(BSLParser.RETURN_KEYWORD, returnKeywordSpelling);
-
-    // TRUE
-    List<String> trueKeywordSpelling = new ArrayList<>();
-    trueKeywordSpelling.add(Keywords.TRUE_RU);
-    trueKeywordSpelling.add(Keywords.TRUE_EN);
-    result.put(BSLParser.TRUE, trueKeywordSpelling);
-
-    // EXCEPT_KEYWORD
-    List<String> exceptKeywordSpelling = new ArrayList<>();
-    exceptKeywordSpelling.add(Keywords.EXCEPT_RU);
-    exceptKeywordSpelling.add(Keywords.EXCEPT_EN);
-    result.put(BSLParser.EXCEPT_KEYWORD, exceptKeywordSpelling);
-
-    // RAISE_KEYWORD
-    List<String> raiseKeywordSpelling = new ArrayList<>();
-    raiseKeywordSpelling.add(Keywords.RAISE_RU);
-    raiseKeywordSpelling.add(Keywords.RAISE_EN);
-    result.put(BSLParser.RAISE_KEYWORD, raiseKeywordSpelling);
-
-    // ENDTRY_KEYWORD
-    List<String> endTryKeywordSpelling = new ArrayList<>();
-    endTryKeywordSpelling.add(Keywords.END_TRY_RU);
-    endTryKeywordSpelling.add(Keywords.END_TRY_EN);
-    result.put(BSLParser.ENDTRY_KEYWORD, endTryKeywordSpelling);
-
-    // ENDPROCEDURE_KEYWORD
-    List<String> endProcedureKeywordSpelling = new ArrayList<>();
-    endProcedureKeywordSpelling.add(Keywords.END_PROCEDURE_RU);
-    endProcedureKeywordSpelling.add(Keywords.END_PROCEDURE_EN);
-    result.put(BSLParser.ENDPROCEDURE_KEYWORD, endProcedureKeywordSpelling);
-
-    // FUNCTION_KEYWORD
-    List<String> functionKeywordSpelling = new ArrayList<>();
-    functionKeywordSpelling.add(Keywords.FUNCTION_RU);
-    functionKeywordSpelling.add(Keywords.FUNCTION_EN);
-    result.put(BSLParser.FUNCTION_KEYWORD, functionKeywordSpelling);
-
-    // ENDFUNCTION_KEYWORD
-    List<String> endfunctionKeywordSpelling = new ArrayList<>();
-    endfunctionKeywordSpelling.add(Keywords.END_FUNCTION_RU);
-    endfunctionKeywordSpelling.add(Keywords.END_FUNCTION_EN);
-    result.put(BSLParser.ENDFUNCTION_KEYWORD, endfunctionKeywordSpelling);
-
-    // FALSE
-    List<String> falseKeywordSpelling = new ArrayList<>();
-    falseKeywordSpelling.add(Keywords.FALSE_RU);
-    falseKeywordSpelling.add(Keywords.FALSE_EN);
-    result.put(BSLParser.FALSE, falseKeywordSpelling);
-
-    // ADDHANDLER_KEYWORD
-    List<String> addHandlerKeywordSpelling = new ArrayList<>();
-    addHandlerKeywordSpelling.add(Keywords.ADD_HANDLER_RU);
-    addHandlerKeywordSpelling.add(Keywords.ADD_HANDLER_EN);
-    result.put(BSLParser.ADDHANDLER_KEYWORD, addHandlerKeywordSpelling);
-
-    // REMOVEHANDLER_KEYWORD
-    List<String> removeHandlerKeywordSpelling = new ArrayList<>();
-    removeHandlerKeywordSpelling.add(Keywords.REMOVE_HANDLER_RU);
-    removeHandlerKeywordSpelling.add(Keywords.REMOVE_HANDLER_EN);
-    result.put(BSLParser.REMOVEHANDLER_KEYWORD, removeHandlerKeywordSpelling);
-
-    // GOTO_KEYWORD
-    List<String> gotoHandlerKeywordSpelling = new ArrayList<>();
-    gotoHandlerKeywordSpelling.add(Keywords.GOTO_RU);
-    gotoHandlerKeywordSpelling.add(Keywords.GOTO_EN);
-    result.put(BSLParser.GOTO_KEYWORD, gotoHandlerKeywordSpelling);
-
-    // AND_KEYWORD
-    List<String> andKeywordSpelling = new ArrayList<>();
-    andKeywordSpelling.add(Keywords.AND_RU);
-    andKeywordSpelling.add(Keywords.AND_UP_EN);
-    andKeywordSpelling.add(Keywords.AND_EN);
-    result.put(BSLParser.AND_KEYWORD, andKeywordSpelling);
-
-    // OR_KEYWORD
-    List<String> orKeywordSpelling = new ArrayList<>();
-    orKeywordSpelling.add(Keywords.OR_RU);
-    orKeywordSpelling.add(Keywords.OR_UP_RU);
-    orKeywordSpelling.add(Keywords.OR_EN);
-    orKeywordSpelling.add(Keywords.OR_UP_EN);
-    result.put(BSLParser.OR_KEYWORD, orKeywordSpelling);
-
-    // NOT_KEYWORD
-    List<String> notKeywordSpelling = new ArrayList<>();
-    notKeywordSpelling.add(Keywords.NOT_RU);
-    notKeywordSpelling.add(Keywords.NOT_UP_RU);
-    notKeywordSpelling.add(Keywords.NOT_EN);
-    notKeywordSpelling.add(Keywords.NOT_UP_EN);
-    result.put(BSLParser.NOT_KEYWORD, notKeywordSpelling);
-
-    // NEW_KEYWORD
-    List<String> newKeywordSpelling = new ArrayList<>();
-    newKeywordSpelling.add(Keywords.NEW_RU);
-    newKeywordSpelling.add(Keywords.NEW_EN);
-    result.put(BSLParser.NEW_KEYWORD, newKeywordSpelling);
-
-    // UNDEFINED
-    List<String> undefinedKeywordSpelling = new ArrayList<>();
-    undefinedKeywordSpelling.add(Keywords.UNDEFINED_RU);
-    undefinedKeywordSpelling.add(Keywords.UNDEFINED_EN);
-    result.put(BSLParser.UNDEFINED, undefinedKeywordSpelling);
-
-    // PREPROC_REGION
-    List<String> regionKeywordSpelling = new ArrayList<>();
-    regionKeywordSpelling.add(Keywords.REGION_RU);
-    regionKeywordSpelling.add(Keywords.REGION_EN);
-    result.put(BSLParser.PREPROC_REGION, regionKeywordSpelling);
-
-    // PREPROC_END_REGION
-    List<String> endRegionKeywordSpelling = new ArrayList<>();
-    endRegionKeywordSpelling.add(Keywords.ENDREGION_RU);
-    endRegionKeywordSpelling.add(Keywords.ENDREGION_EN);
-    result.put(BSLParser.PREPROC_END_REGION, endRegionKeywordSpelling);
-
-    // PREPROC_IF_KEYWORD
-    List<String> preprocIfKeywordSpelling = new ArrayList<>();
-    preprocIfKeywordSpelling.add(Keywords.IF_RU);
-    preprocIfKeywordSpelling.add(Keywords.IF_EN);
-    result.put(BSLParser.PREPROC_IF_KEYWORD, preprocIfKeywordSpelling);
-
-    // PREPROC_THEN_KEYWORD
-    List<String> preprocThenKeywordSpelling = new ArrayList<>();
-    preprocThenKeywordSpelling.add(Keywords.THEN_RU);
-    preprocThenKeywordSpelling.add(Keywords.THEN_EN);
-    result.put(BSLParser.PREPROC_THEN_KEYWORD, preprocThenKeywordSpelling);
-
-    // PREPROC_ELSIF_KEYWORD
-    List<String> preprocElsIfKeywordSpelling = new ArrayList<>();
-    preprocElsIfKeywordSpelling.add(Keywords.ELSIF_RU);
-    preprocElsIfKeywordSpelling.add(Keywords.ELSIF_EN);
-    result.put(BSLParser.PREPROC_ELSIF_KEYWORD, preprocElsIfKeywordSpelling);
-
-    // PREPROC_ELSE_KEYWORD
-    List<String> preprocElseKeywordSpelling = new ArrayList<>();
-    preprocElseKeywordSpelling.add(Keywords.ELSE_RU);
-    preprocElseKeywordSpelling.add(Keywords.ELSE_EN);
-    result.put(BSLParser.PREPROC_ELSE_KEYWORD, preprocElseKeywordSpelling);
-
-    // PREPROC_ENDIF_KEYWORD
-    List<String> preprocEndIfKeywordSpelling = new ArrayList<>();
-    preprocEndIfKeywordSpelling.add(Keywords.ENDIF_RU);
-    preprocEndIfKeywordSpelling.add(Keywords.ENDIF_EN);
-    result.put(BSLParser.PREPROC_ENDIF_KEYWORD, preprocEndIfKeywordSpelling);
-
-    // PREPROC_OR_KEYWORD
-    List<String> preprocOrKeywordSpelling = new ArrayList<>();
-    preprocOrKeywordSpelling.add(Keywords.OR_RU);
-    preprocOrKeywordSpelling.add(Keywords.OR_UP_RU);
-    preprocOrKeywordSpelling.add(Keywords.OR_EN);
-    preprocOrKeywordSpelling.add(Keywords.OR_UP_EN);
-    result.put(BSLParser.PREPROC_OR_KEYWORD, preprocOrKeywordSpelling);
-
-    // PREPROC_AND_KEYWORD
-    List<String> preprocAndKeywordSpelling = new ArrayList<>();
-    preprocAndKeywordSpelling.add(Keywords.AND_RU);
-    preprocAndKeywordSpelling.add(Keywords.AND_EN);
-    preprocAndKeywordSpelling.add(Keywords.AND_UP_EN);
-    result.put(BSLParser.PREPROC_AND_KEYWORD, preprocAndKeywordSpelling);
-
-    // PREPROC_NOT_KEYWORD
-    List<String> preprocNotKeywordSpelling = new ArrayList<>();
-    preprocNotKeywordSpelling.add(Keywords.NOT_RU);
-    preprocNotKeywordSpelling.add(Keywords.NOT_UP_RU);
-    preprocNotKeywordSpelling.add(Keywords.NOT_EN);
-    preprocNotKeywordSpelling.add(Keywords.NOT_UP_EN);
-    result.put(BSLParser.PREPROC_NOT_KEYWORD, preprocNotKeywordSpelling);
-
-    // PREPROC_SERVER_SYMBOL
-    List<String> preprocServerKeywordSpelling = new ArrayList<>();
-    preprocServerKeywordSpelling.add(Keywords.SERVER_RU);
-    preprocServerKeywordSpelling.add(Keywords.SERVER_EN);
-    result.put(BSLParser.PREPROC_SERVER_SYMBOL, preprocServerKeywordSpelling);
-
-    // PREPROC_CLIENT_SYMBOL
-    List<String> preprocClientKeywordSpelling = new ArrayList<>();
-    preprocClientKeywordSpelling.add(Keywords.CLIENT_RU);
-    preprocClientKeywordSpelling.add(Keywords.CLIENT_EN);
-    result.put(BSLParser.PREPROC_CLIENT_SYMBOL, preprocClientKeywordSpelling);
-
-    // PREPROC_MOBILEAPPCLIENT_SYMBOL
-    List<String> preprocMobileAppClientKeywordSpelling = new ArrayList<>();
-    preprocMobileAppClientKeywordSpelling.add(Keywords.MOBILE_APP_CLIENT_RU);
-    preprocMobileAppClientKeywordSpelling.add(Keywords.MOBILE_APP_CLIENT_EN);
-    result.put(BSLParser.PREPROC_MOBILEAPPCLIENT_SYMBOL, preprocMobileAppClientKeywordSpelling);
-
-    // PREPROC_MOBILEAPPSERVER_SYMBOL
-    List<String> preprocMobileAppServerKeywordSpelling = new ArrayList<>();
-    preprocMobileAppServerKeywordSpelling.add(Keywords.MOBILE_APP_SERVER_RU);
-    preprocMobileAppServerKeywordSpelling.add(Keywords.MOBILE_APP_SERVER_EN);
-    result.put(BSLParser.PREPROC_MOBILEAPPSERVER_SYMBOL, preprocMobileAppServerKeywordSpelling);
-
-    // PREPROC_MOBILECLIENT_SYMBOL
-    List<String> preprocMobileClientKeywordSpelling = new ArrayList<>();
-    preprocMobileClientKeywordSpelling.add(Keywords.MOBILE_CLIENT_RU);
-    preprocMobileClientKeywordSpelling.add(Keywords.MOBILE_CLIENT_EN);
-    result.put(BSLParser.PREPROC_MOBILECLIENT_SYMBOL, preprocMobileClientKeywordSpelling);
-
-    // PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL
-    List<String> preprocThickClientOrdinaryKeywordSpelling = new ArrayList<>();
-    preprocThickClientOrdinaryKeywordSpelling.add(Keywords.THICK_CLIENT_ORDINARY_APPLICATION_RU);
-    preprocThickClientOrdinaryKeywordSpelling.add(Keywords.THICK_CLIENT_ORDINARY_APPLICATION_EN);
-    result.put(BSLParser.PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL, preprocThickClientOrdinaryKeywordSpelling);
-
-    // PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL
-    List<String> preprocThickClientManagedKeywordSpelling = new ArrayList<>();
-    preprocThickClientManagedKeywordSpelling.add(Keywords.THICK_CLIENT_MANAGED_APPLICATION_RU);
-    preprocThickClientManagedKeywordSpelling.add(Keywords.THICK_CLIENT_MANAGED_APPLICATION_EN);
-    result.put(BSLParser.PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL, preprocThickClientManagedKeywordSpelling);
-
-    // PREPROC_EXTERNALCONNECTION_SYMBOL
-    List<String> preprocExternalConnKeywordSpelling = new ArrayList<>();
-    preprocExternalConnKeywordSpelling.add(Keywords.EXTERNAL_CONNECTION_RU);
-    preprocExternalConnKeywordSpelling.add(Keywords.EXTERNAL_CONNECTION_EN);
-    result.put(BSLParser.PREPROC_EXTERNALCONNECTION_SYMBOL, preprocExternalConnKeywordSpelling);
-
-    // PREPROC_THINCLIENT_SYMBOL
-    List<String> preprocThinClientKeywordSpelling = new ArrayList<>();
-    preprocThinClientKeywordSpelling.add(Keywords.THIN_CLIENT_RU);
-    preprocThinClientKeywordSpelling.add(Keywords.THIN_CLIENT_EN);
-    result.put(BSLParser.PREPROC_THINCLIENT_SYMBOL, preprocThinClientKeywordSpelling);
-
-    // PREPROC_WEBCLIENT_SYMBOL
-    List<String> preprocWebClientKeywordSpelling = new ArrayList<>();
-    preprocWebClientKeywordSpelling.add(Keywords.WEB_CLIENT_RU);
-    preprocWebClientKeywordSpelling.add(Keywords.WEB_CLIENT_EN);
-    result.put(BSLParser.PREPROC_WEBCLIENT_SYMBOL, preprocWebClientKeywordSpelling);
-
-    // PREPROC_ATCLIENT_SYMBOL
-    List<String> preprocAtClientKeywordSpelling = new ArrayList<>();
-    preprocAtClientKeywordSpelling.add(Keywords.AT_CLIENT_RU);
-    preprocAtClientKeywordSpelling.add(Keywords.AT_CLIENT_EN);
-    result.put(BSLParser.PREPROC_ATCLIENT_SYMBOL, preprocAtClientKeywordSpelling);
-
-    // PREPROC_ATSERVER_SYMBOL
-    List<String> preprocAtServerKeywordSpelling = new ArrayList<>();
-    preprocAtServerKeywordSpelling.add(Keywords.AT_SERVER_RU);
-    preprocAtServerKeywordSpelling.add(Keywords.AT_SERVER_EN);
-    result.put(BSLParser.PREPROC_ATSERVER_SYMBOL, preprocAtServerKeywordSpelling);
-
-    // ANNOTATION_ATCLIENT_SYMBOL
-    List<String> annotAtClientKeywordSpelling = new ArrayList<>();
-    annotAtClientKeywordSpelling.add(Keywords.AT_CLIENT_RU);
-    annotAtClientKeywordSpelling.add(Keywords.AT_CLIENT_EN);
-    result.put(BSLParser.ANNOTATION_ATCLIENT_SYMBOL, annotAtClientKeywordSpelling);
-
-    // ANNOTATION_ATSERVER_SYMBOL_SYMBOL
-    List<String> annotAtServerKeywordSpelling = new ArrayList<>();
-    annotAtServerKeywordSpelling.add(Keywords.AT_SERVER_RU);
-    annotAtServerKeywordSpelling.add(Keywords.AT_SERVER_EN);
-    result.put(BSLParser.ANNOTATION_ATSERVER_SYMBOL, annotAtServerKeywordSpelling);
-
-    // ANNOTATION_ATSERVERNOCONTEXT_SYMBOL
-    List<String> annotAtServerNoContextKeywordSpelling = new ArrayList<>();
-    annotAtServerNoContextKeywordSpelling.add(Keywords.AT_SERVER_NO_CONTEXT_RU);
-    annotAtServerNoContextKeywordSpelling.add(Keywords.AT_SERVER_NO_CONTEXT_EN);
-    result.put(BSLParser.ANNOTATION_ATSERVERNOCONTEXT_SYMBOL, annotAtServerNoContextKeywordSpelling);
-
-    // ANNOTATION_ATCLIENTATSERVERNOCONTEXT_SYMBOL
-    List<String> annotAtClientServerNoContextKeywordSpelling = new ArrayList<>();
-    annotAtClientServerNoContextKeywordSpelling.add(Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_RU);
-    annotAtClientServerNoContextKeywordSpelling.add(Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_EN);
-    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVERNOCONTEXT_SYMBOL, annotAtClientServerNoContextKeywordSpelling);
-
-    // ANNOTATION_ATCLIENTATSERVER_SYMBOL
-    List<String> annotAtClientServerKeywordSpelling = new ArrayList<>();
-    annotAtClientServerKeywordSpelling.add(Keywords.AT_CLIENT_AT_SERVER_RU);
-    annotAtClientServerKeywordSpelling.add(Keywords.AT_CLIENT_AT_SERVER_EN);
-    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVER_SYMBOL, annotAtClientServerKeywordSpelling);
+    result.put(BSLParser.IF_KEYWORD, makeListKeywords(Keywords.IF_RU, Keywords.IF_EN));
+    result.put(BSLParser.THEN_KEYWORD, makeListKeywords(Keywords.THEN_RU, Keywords.THEN_EN));
+    result.put(BSLParser.ELSE_KEYWORD, makeListKeywords(Keywords.ELSE_RU, Keywords.ELSE_EN));
+    result.put(BSLParser.ELSIF_KEYWORD, makeListKeywords(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
+    result.put(BSLParser.ENDIF_KEYWORD, makeListKeywords(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
+    result.put(BSLParser.FOR_KEYWORD, makeListKeywords(Keywords.FOR_RU, Keywords.FOR_EN));
+    result.put(BSLParser.EACH_KEYWORD, makeListKeywords(
+      Keywords.EACH_RU, Keywords.EACH_LO_RU,
+      Keywords.EACH_EN, Keywords.EACH_LO_EN));
+    result.put(BSLParser.IN_KEYWORD, makeListKeywords(Keywords.IN_RU, Keywords.IN_EN));
+    result.put(BSLParser.DO_KEYWORD, makeListKeywords(Keywords.DO_RU, Keywords.DO_EN));
+    result.put(BSLParser.WHILE_KEYWORD, makeListKeywords(Keywords.WHILE_RU, Keywords.WHILE_EN));
+    result.put(BSLParser.BREAK_KEYWORD, makeListKeywords(Keywords.BREAK_RU, Keywords.BREAK_EN));
+    result.put(BSLParser.CONTINUE_KEYWORD, makeListKeywords(Keywords.CONTINUE_RU, Keywords.CONTINUE_EN));
+    result.put(BSLParser.ENDDO_KEYWORD, makeListKeywords(Keywords.END_DO_RU, Keywords.END_DO_EN));
+    result.put(BSLParser.TO_KEYWORD, makeListKeywords(Keywords.TO_RU, Keywords.TO_EN));
+    result.put(BSLParser.PROCEDURE_KEYWORD, makeListKeywords(Keywords.PROCEDURE_RU, Keywords.PROCEDURE_EN));
+    result.put(BSLParser.VAL_KEYWORD, makeListKeywords(Keywords.VAL_RU, Keywords.VAL_EN));
+    result.put(BSLParser.EXPORT_KEYWORD, makeListKeywords(Keywords.EXPORT_RU, Keywords.EXPORT_EN));
+    result.put(BSLParser.VAR_KEYWORD, makeListKeywords(Keywords.VAR_RU, Keywords.VAR_EN));
+    result.put(BSLParser.TRY_KEYWORD, makeListKeywords(Keywords.TRY_RU, Keywords.TRY_EN));
+    result.put(BSLParser.EXECUTE_KEYWORD, makeListKeywords(Keywords.EXECUTE_RU, Keywords.EXECUTE_EN));
+    result.put(BSLParser.RETURN_KEYWORD, makeListKeywords(Keywords.RETURN_RU, Keywords.RETURN_EN));
+    result.put(BSLParser.TRUE, makeListKeywords(Keywords.TRUE_RU, Keywords.TRUE_EN));
+    result.put(BSLParser.EXCEPT_KEYWORD, makeListKeywords(Keywords.EXCEPT_RU, Keywords.EXCEPT_EN));
+    result.put(BSLParser.RAISE_KEYWORD, makeListKeywords(Keywords.RAISE_RU, Keywords.RAISE_EN));
+    result.put(BSLParser.ENDTRY_KEYWORD, makeListKeywords(Keywords.END_TRY_RU, Keywords.END_TRY_EN));
+    result.put(BSLParser.ENDPROCEDURE_KEYWORD, makeListKeywords(Keywords.END_PROCEDURE_RU, Keywords.END_PROCEDURE_EN));
+    result.put(BSLParser.FUNCTION_KEYWORD, makeListKeywords(Keywords.FUNCTION_RU, Keywords.FUNCTION_EN));
+    result.put(BSLParser.ENDFUNCTION_KEYWORD, makeListKeywords(Keywords.END_FUNCTION_RU, Keywords.END_FUNCTION_EN));
+    result.put(BSLParser.FALSE, makeListKeywords(Keywords.FALSE_RU, Keywords.FALSE_EN));
+    result.put(BSLParser.ADDHANDLER_KEYWORD, makeListKeywords(Keywords.ADD_HANDLER_RU, Keywords.ADD_HANDLER_EN));
+    result.put(BSLParser.REMOVEHANDLER_KEYWORD, makeListKeywords(
+      Keywords.REMOVE_HANDLER_RU, Keywords.REMOVE_HANDLER_EN));
+    result.put(BSLParser.GOTO_KEYWORD, makeListKeywords(Keywords.GOTO_RU, Keywords.GOTO_EN));
+    result.put(BSLParser.AND_KEYWORD, makeListKeywords(
+      Keywords.AND_RU, Keywords.AND_UP_EN, Keywords.AND_EN));
+    result.put(BSLParser.OR_KEYWORD, makeListKeywords(
+      Keywords.OR_RU, Keywords.OR_UP_RU, Keywords.OR_EN, Keywords.OR_UP_EN));
+    result.put(BSLParser.NOT_KEYWORD, makeListKeywords(
+      Keywords.NOT_RU, Keywords.NOT_UP_RU, Keywords.NOT_EN, Keywords.NOT_UP_EN));
+    result.put(BSLParser.NEW_KEYWORD, makeListKeywords(Keywords.NEW_RU, Keywords.NEW_EN));
+    result.put(BSLParser.UNDEFINED, makeListKeywords(Keywords.UNDEFINED_RU, Keywords.UNDEFINED_EN));
+    result.put(BSLParser.PREPROC_REGION, makeListKeywords(Keywords.REGION_RU, Keywords.REGION_EN));
+    result.put(BSLParser.PREPROC_END_REGION, makeListKeywords(Keywords.ENDREGION_RU, Keywords.ENDREGION_EN));
+    result.put(BSLParser.PREPROC_IF_KEYWORD, makeListKeywords(Keywords.IF_RU, Keywords.IF_EN));
+    result.put(BSLParser.PREPROC_THEN_KEYWORD, makeListKeywords(Keywords.THEN_RU, Keywords.THEN_EN));
+    result.put(BSLParser.PREPROC_ELSIF_KEYWORD, makeListKeywords(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
+    result.put(BSLParser.PREPROC_ELSE_KEYWORD, makeListKeywords(Keywords.ELSE_RU, Keywords.ELSE_EN));
+    result.put(BSLParser.PREPROC_ENDIF_KEYWORD, makeListKeywords(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
+    result.put(BSLParser.PREPROC_OR_KEYWORD, makeListKeywords(
+      Keywords.OR_RU, Keywords.OR_UP_RU, Keywords.OR_EN, Keywords.OR_UP_EN));
+    result.put(BSLParser.PREPROC_AND_KEYWORD, makeListKeywords(
+      Keywords.AND_RU, Keywords.AND_EN, Keywords.AND_UP_EN));
+    result.put(BSLParser.PREPROC_NOT_KEYWORD, makeListKeywords(
+      Keywords.NOT_RU, Keywords.NOT_UP_RU, Keywords.NOT_EN, Keywords.NOT_UP_EN));
+    result.put(BSLParser.PREPROC_SERVER_SYMBOL, makeListKeywords(Keywords.SERVER_RU, Keywords.SERVER_EN));
+    result.put(BSLParser.PREPROC_CLIENT_SYMBOL, makeListKeywords(Keywords.CLIENT_RU, Keywords.CLIENT_EN));
+    result.put(BSLParser.PREPROC_MOBILEAPPCLIENT_SYMBOL, makeListKeywords(
+      Keywords.MOBILE_APP_CLIENT_RU, Keywords.MOBILE_APP_CLIENT_EN));
+    result.put(BSLParser.PREPROC_MOBILEAPPSERVER_SYMBOL, makeListKeywords(
+      Keywords.MOBILE_APP_SERVER_RU, Keywords.MOBILE_APP_SERVER_EN));
+    result.put(BSLParser.PREPROC_MOBILECLIENT_SYMBOL, makeListKeywords(
+      Keywords.MOBILE_CLIENT_RU, Keywords.MOBILE_CLIENT_EN));
+    result.put(BSLParser.PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL, makeListKeywords(
+      Keywords.THICK_CLIENT_ORDINARY_APPLICATION_RU, Keywords.THICK_CLIENT_ORDINARY_APPLICATION_EN));
+    result.put(BSLParser.PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL, makeListKeywords(
+      Keywords.THICK_CLIENT_MANAGED_APPLICATION_RU, Keywords.THICK_CLIENT_MANAGED_APPLICATION_EN));
+    result.put(BSLParser.PREPROC_EXTERNALCONNECTION_SYMBOL, makeListKeywords(
+      Keywords.EXTERNAL_CONNECTION_RU, Keywords.EXTERNAL_CONNECTION_EN));
+    result.put(BSLParser.PREPROC_THINCLIENT_SYMBOL, makeListKeywords(Keywords.THIN_CLIENT_RU, Keywords.THIN_CLIENT_EN));
+    result.put(BSLParser.PREPROC_WEBCLIENT_SYMBOL, makeListKeywords(Keywords.WEB_CLIENT_RU, Keywords.WEB_CLIENT_EN));
+    result.put(BSLParser.PREPROC_ATCLIENT_SYMBOL, makeListKeywords(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
+    result.put(BSLParser.PREPROC_ATSERVER_SYMBOL, makeListKeywords(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
+    result.put(BSLParser.ANNOTATION_ATCLIENT_SYMBOL, makeListKeywords(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
+    result.put(BSLParser.ANNOTATION_ATSERVER_SYMBOL, makeListKeywords(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
+    result.put(BSLParser.ANNOTATION_ATSERVERNOCONTEXT_SYMBOL, makeListKeywords(
+      Keywords.AT_SERVER_NO_CONTEXT_RU, Keywords.AT_SERVER_NO_CONTEXT_EN));
+    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVERNOCONTEXT_SYMBOL, makeListKeywords(
+      Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_RU, Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_EN));
+    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVER_SYMBOL, makeListKeywords(
+      Keywords.AT_CLIENT_AT_SERVER_RU, Keywords.AT_CLIENT_AT_SERVER_EN));
 
     return result;
   }
@@ -628,4 +316,8 @@ public List<CodeAction> getQuickFixes(
     );
 
   }
+
+  private static List<String> makeListKeywords(String... keyword) {
+    return Arrays.asList(keyword);
+  }
 }

From 359085375fada67cf359eec49b422acbe0fd83b3 Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 16:29:04 +0300
Subject: [PATCH 329/444] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20=D1=81=D0=BE=D0=BD=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../computer/RegionSymbolComputer.java        |  3 ++-
 .../CanonicalSpellingKeywordsDiagnostic.java  |  3 ---
 .../CreateQueryInCycleDiagnostic.java         | 23 ++++++-------------
 .../diagnostics/DiagnosticSupplier.java       |  2 +-
 .../diagnostics/EmptyRegionDiagnostic.java    |  3 ++-
 .../ExcessiveAutoTestCheckDiagnostic.java     |  1 -
 .../InvalidCharacterInFileDiagnostic.java     | 13 +++++------
 ...MissingVariablesDescriptionDiagnostic.java |  1 -
 .../UnreachableCodeDiagnostic.java            |  5 +++-
 .../UnsafeSafeModeMethodCallDiagnostic.java   |  3 ++-
 .../reporter/GenericCoverageReport.java       |  4 ++--
 .../utils/DiagnosticHelper.java               |  6 ++---
 12 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
index b4a15c7f6cc..f053e8ced4f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/RegionSymbolComputer.java
@@ -40,7 +40,8 @@ public final class RegionSymbolComputer
   implements Computer<List<RegionSymbol>> {
 
   private final DocumentContext documentContext;
-  private final Deque<Pair<RegionSymbol.RegionSymbolBuilder, BSLParser.RegionStartContext>> regionStack = new ArrayDeque<>();
+  private final Deque<Pair<RegionSymbol.RegionSymbolBuilder, BSLParser.RegionStartContext>> regionStack =
+    new ArrayDeque<>();
   private final List<RegionSymbol> regions = new ArrayList<>();
 
   public RegionSymbolComputer(DocumentContext documentContext) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 27da6d41d3e..4cba4581cb4 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -158,9 +158,7 @@ private static Map<Integer, List<String>> getDefaultPreset() {
   }
 
   private static Map<String, String> getCanonical() {
-
     Map<String, String> result = new HashMap<>();
-
     result.put(Keywords.IF_UP_RU, Keywords.IF_RU);
     result.put(Keywords.IF_UP_EN, Keywords.IF_EN);
     result.put(Keywords.THEN_UP_RU, Keywords.THEN_RU);
@@ -269,7 +267,6 @@ private static Map<String, String> getCanonical() {
     result.put(Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_UP_EN, Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_EN);
     result.put(Keywords.AT_CLIENT_AT_SERVER_UP_RU, Keywords.AT_CLIENT_AT_SERVER_RU);
     result.put(Keywords.AT_CLIENT_AT_SERVER_UP_EN, Keywords.AT_CLIENT_AT_SERVER_EN);
-
     return result;
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
index b1ad247d1b3..8de4d96733e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CreateQueryInCycleDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParser.AssignmentContext;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.ToString;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RuleContext;
@@ -53,22 +54,12 @@
   }
 )
 public class CreateQueryInCycleDiagnostic extends AbstractVisitorDiagnostic {
-  private static final Pattern EXECUTE_CALL_PATTERN = Pattern.compile(
-    "Выполнить|Execute",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-
-  private static final Pattern QUERY_BUILDER_PATTERN = Pattern.compile(
-    "ПостроительЗапроса|QueryBuilder",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-
-  private static final Pattern REPORT_BUILDER_PATTERN = Pattern.compile(
-    "ПостроительОтчета|ReportBuilder",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-
-  private static final Pattern QUERY_PATTERN = Pattern.compile(
-    "Запрос|Query",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-
+  private static final Pattern EXECUTE_CALL_PATTERN = CaseInsensitivePattern.compile("Выполнить|Execute");
+  private static final Pattern QUERY_BUILDER_PATTERN =
+    CaseInsensitivePattern.compile("ПостроительЗапроса|QueryBuilder");
+  private static final Pattern REPORT_BUILDER_PATTERN =
+    CaseInsensitivePattern.compile("ПостроительОтчета|ReportBuilder");
+  private static final Pattern QUERY_PATTERN = CaseInsensitivePattern.compile("Запрос|Query");
 
   private static final String BOOLEAN_TYPE = "Boolean";
   private static final String DATE_TYPE = "Datetime";
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
index d494f1a3e2b..99bbdb90c37 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticSupplier.java
@@ -21,10 +21,10 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.Mode;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport;
-import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
index 6e3076a45de..0dc1c3e7e2a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/EmptyRegionDiagnostic.java
@@ -34,6 +34,7 @@
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextEdit;
 
 import java.util.ArrayDeque;
@@ -100,7 +101,7 @@ public List<CodeAction> getQuickFixes(
       .stream()
       .map(Diagnostic::getRange)
       .sorted(Comparator.comparingInt(o -> o.getStart().getLine()))
-      .reduce((prev, curr) -> {
+      .reduce((Range prev, Range curr) -> {
         if (prev.getEnd().getLine() > curr.getStart().getLine()) {
           return prev;
         } else {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
index 6adea7f6093..51b1faa4a31 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -28,7 +28,6 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
-import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.List;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index 034c98aaca5..feb2f8cd370 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -96,15 +96,14 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
         || token.getType() == BSLLexer.STRINGTAIL
       )
       .filter((Token token) -> ILLEGAL_PATTERN.matcher(token.getText()).find())
-      .forEach(token ->
+      .forEach((Token token) ->
         {
           var text = token.getText();
-            String message = diagnosticMessageDash;
-            if (ILLEGAL_SPACE_PATTERN.matcher(text).find()){
-              message = diagnosticMessageSpace;
-            }
-            diagnosticStorage.addDiagnostic(token, message);
-
+          String message = diagnosticMessageDash;
+          if (ILLEGAL_SPACE_PATTERN.matcher(text).find()) {
+            message = diagnosticMessageSpace;
+          }
+          diagnosticStorage.addDiagnostic(token, message);
         }
       );
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
index 8dfecd6e396..28c8b9de283 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingVariablesDescriptionDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.symbol.VariableSymbol;
 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;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
index 9d2a6a185a1..f14d039d01d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnreachableCodeDiagnostic.java
@@ -174,7 +174,10 @@ private void findAndAddDiagnostic(BSLParserRuleContext ctx) {
       .stream()
       .filter(node ->
         node.getStart().getType() != BSLLexer.SEMICOLON
-          && !Trees.nodeContains(node, BSLParser.RULE_regionStart, BSLParser.RULE_regionEnd, BSLParser.RULE_preproc_endif))
+          && !Trees.nodeContains(node,
+            BSLParser.RULE_regionStart,
+            BSLParser.RULE_regionEnd,
+            BSLParser.RULE_preproc_endif))
       .collect(Collectors.toList());
 
     // если в блоке кода есть еще стейты кроме текущего
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 44d94f4119e..2921673ad5e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -75,7 +75,8 @@ protected boolean checkGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       return false;
     }
 
-    BSLParser.MemberContext currentRootMember = (BSLParser.MemberContext)Trees.getRootParent(ctx, BSLParser.RULE_member);
+    BSLParser.MemberContext currentRootMember =
+      (BSLParser.MemberContext) Trees.getRootParent(ctx, BSLParser.RULE_member);
     if (currentRootMember == null) {
       return false;
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
index f3793d3ac11..880399f975c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/reporter/GenericCoverageReport.java
@@ -73,8 +73,8 @@ public GenericCoverageReportEntry(FileInfo fileInfo) {
       this.path = fileInfo.getPath().toString();
       this.lineToCover = new ArrayList<>();
 
-      for (int lineToCover : fileInfo.getMetrics().getCovlocData()) {
-        this.lineToCover.add(new LineToCoverEntry(lineToCover, false));
+      for (int lineNumToCover : fileInfo.getMetrics().getCovlocData()) {
+        this.lineToCover.add(new LineToCoverEntry(lineNumToCover, false));
       }
     }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/DiagnosticHelper.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/DiagnosticHelper.java
index 2309b260d88..f67b999d792 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/DiagnosticHelper.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/DiagnosticHelper.java
@@ -24,6 +24,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameterInfo;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
@@ -35,12 +36,9 @@
 import java.util.Set;
 
 @Slf4j
+@UtilityClass
 public final class DiagnosticHelper {
 
-  private DiagnosticHelper() {
-    // Utility class
-  }
-
   public static boolean equalNodes(Tree leftNode, Tree rightNode) {
 
     if (leftNode.getChildCount() != rightNode.getChildCount()

From fdecdd57c859e7cfbeeb41b3202642254f0c19b6 Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 16:30:57 +0300
Subject: [PATCH 330/444] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20OS=20=D0=B2=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index d9860190cf2..70e1cce3cc3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -179,6 +179,7 @@ license {
     exclude("**/*.xml")
     exclude("**/*.json")
     exclude("**/*.bsl")
+    exclude("**/*.os")
 }
 
 sonarqube {

From b4f7bcce321629187cd45c7256caef59f8aa8ebb Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 16:53:41 +0300
Subject: [PATCH 331/444] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=BD=D0=B5=D1=81?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanonicalSpellingKeywordsDiagnostic.java  |  4 ++--
 .../diagnostics/UsingThisFormDiagnostic.java  | 21 +++++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 4cba4581cb4..5fde40d6a94 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -78,8 +78,7 @@ private static Map<Integer, List<String>> getDefaultPreset() {
     result.put(BSLParser.ENDIF_KEYWORD, makeListKeywords(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
     result.put(BSLParser.FOR_KEYWORD, makeListKeywords(Keywords.FOR_RU, Keywords.FOR_EN));
     result.put(BSLParser.EACH_KEYWORD, makeListKeywords(
-      Keywords.EACH_RU, Keywords.EACH_LO_RU,
-      Keywords.EACH_EN, Keywords.EACH_LO_EN));
+      Keywords.EACH_RU, Keywords.EACH_LO_RU, Keywords.EACH_EN, Keywords.EACH_LO_EN));
     result.put(BSLParser.IN_KEYWORD, makeListKeywords(Keywords.IN_RU, Keywords.IN_EN));
     result.put(BSLParser.DO_KEYWORD, makeListKeywords(Keywords.DO_RU, Keywords.DO_EN));
     result.put(BSLParser.WHILE_KEYWORD, makeListKeywords(Keywords.WHILE_RU, Keywords.WHILE_EN));
@@ -159,6 +158,7 @@ private static Map<Integer, List<String>> getDefaultPreset() {
 
   private static Map<String, String> getCanonical() {
     Map<String, String> result = new HashMap<>();
+
     result.put(Keywords.IF_UP_RU, Keywords.IF_RU);
     result.put(Keywords.IF_UP_EN, Keywords.IF_EN);
     result.put(Keywords.THEN_UP_RU, Keywords.THEN_RU);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingThisFormDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingThisFormDiagnostic.java
index 84511c8ac63..978f498d6a3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingThisFormDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingThisFormDiagnostic.java
@@ -34,6 +34,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.eclipse.lsp4j.CodeAction;
@@ -63,14 +64,8 @@
 )
 public class UsingThisFormDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
 
-  private static final Pattern pattern = Pattern.compile(
-    "^(этаформа|thisform)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-  );
-  private static final Pattern onlyRuPattern = Pattern.compile(
-    "этаформа",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-  );
+  private static final Pattern PATTERN = CaseInsensitivePattern.compile("^(этаформа|thisform)");
+  private static final Pattern ONLY_RU_PATTERN = CaseInsensitivePattern.compile("этаформа");
   private static final String THIS_OBJECT = "ЭтотОбъект";
   private static final String THIS_OBJECT_EN = "ThisObject";
 
@@ -109,7 +104,7 @@ private static List<? extends BSLParser.ParamContext> getParams(BSLParserRuleCon
 
   private static boolean hasThisForm(List<? extends BSLParser.ParamContext> params) {
     for (BSLParser.ParamContext param : params) {
-      if (pattern.matcher(param.getText()).find()) {
+      if (PATTERN.matcher(param.getText()).find()) {
         return true;
       }
     }
@@ -123,7 +118,7 @@ public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
       return super.visitCallStatement(ctx);
     }
 
-    if (pattern.matcher(ctx.getStart().getText()).matches()) {
+    if (PATTERN.matcher(ctx.getStart().getText()).matches()) {
       diagnosticStorage.addDiagnostic(ctx.getStart());
     }
 
@@ -133,7 +128,7 @@ public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
   @Override
   public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx) {
     Trees.findAllTokenNodes(ctx, BSLParser.IDENTIFIER).stream()
-      .filter(token -> pattern.matcher(token.getText()).matches())
+      .filter(token -> PATTERN.matcher(token.getText()).matches())
       .forEach(token -> diagnosticStorage.addDiagnostic((TerminalNode) token));
 
     return ctx;
@@ -164,7 +159,7 @@ public List<CodeAction> getQuickFixes(
   public ParseTree visitLValue(BSLParser.LValueContext ctx) {
 
     TerminalNode identifier = ctx.IDENTIFIER();
-    if (identifier != null && pattern.matcher(identifier.getText()).matches()) {
+    if (identifier != null && PATTERN.matcher(identifier.getText()).matches()) {
       diagnosticStorage.addDiagnostic(identifier);
     }
     return super.visitLValue(ctx);
@@ -174,7 +169,7 @@ private static TextEdit getQuickFixText(Diagnostic diagnostic, DocumentContext d
     Range range = diagnostic.getRange();
     String currentText = documentContext.getText(range);
 
-    if (onlyRuPattern.matcher(currentText).matches()) {
+    if (ONLY_RU_PATTERN.matcher(currentText).matches()) {
       return new TextEdit(range, THIS_OBJECT);
     }
 

From f1a20ae625e188053f4179be3c15dc0d1c8fb06e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 20 May 2020 17:06:18 +0300
Subject: [PATCH 332/444] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedMethodCallDiagnostic.java       | 45 ++++++++++---------
 .../languageserver/utils/MdoRefBuilder.java   |  1 -
 .../DeprecatedMethodCallDiagnostic.bsl        | 21 +++++----
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index 1129925df2d..f327085ece6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -22,17 +22,19 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.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.utils.MdoRefBuilder;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
-import javax.annotation.CheckForNull;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -55,40 +57,44 @@ public DeprecatedMethodCallDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
 
-    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
-    if (mdoRef.isEmpty()) {
+    if (currentMethodIsDeprecated(ctx, documentContext)) {
       return super.visitCallStatement(ctx);
     }
 
-    Token methodName = getMethodName(ctx);
-    if (methodName == null) {
+    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
+    if (mdoRef.isEmpty()) {
       return super.visitCallStatement(ctx);
     }
 
-    checkDeprecatedCall(mdoRef, methodName);
+    getMethodName(ctx).ifPresent(methodName -> checkDeprecatedCall(mdoRef, methodName));
 
     return super.visitCallStatement(ctx);
   }
 
-
   @Override
   public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx) {
 
-    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
-    if (mdoRef.isEmpty()) {
+    if (currentMethodIsDeprecated(ctx, documentContext)) {
       return super.visitComplexIdentifier(ctx);
     }
 
-    Token methodName = getMethodName(ctx);
-    if (methodName == null) {
+    String mdoRef = MdoRefBuilder.getMdoRef(documentContext, ctx);
+    if (mdoRef.isEmpty()) {
       return super.visitComplexIdentifier(ctx);
     }
 
-    checkDeprecatedCall(mdoRef, methodName);
+    getMethodName(ctx).ifPresent(methodName -> checkDeprecatedCall(mdoRef, methodName));
 
     return super.visitComplexIdentifier(ctx);
   }
 
+  private static boolean currentMethodIsDeprecated(BSLParserRuleContext ctx, DocumentContext documentContext) {
+    return Optional.ofNullable(Trees.getRootParent(ctx, BSLParser.RULE_sub))
+      .flatMap(sub -> documentContext.getSymbolTree().getMethodSymbol(sub))
+      .map(MethodSymbol::isDeprecated)
+      .orElse(false);
+  }
+
   private void checkDeprecatedCall(String mdoRef, Token methodName) {
     var documentContexts = documentContext.getServerContext().getDocuments(mdoRef);
     String methodNameText = methodName.getText();
@@ -102,32 +108,31 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
       .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
   }
 
-  private static Token getMethodName(BSLParser.CallStatementContext ctx) {
+  private static Optional<Token> getMethodName(BSLParser.CallStatementContext ctx) {
     var modifiers = ctx.modifier();
     var methodName = getMethodName(ctx.accessCall());
 
     if (modifiers.isEmpty()) {
       return methodName;
     } else {
-      return Optional.ofNullable(getMethodName(modifiers)).orElse(methodName);
+      return getMethodName(modifiers).or(() -> methodName);
     }
   }
 
-  private static Token getMethodName(BSLParser.AccessCallContext ctx) {
-    return ctx.methodCall().methodName().getStart();
+  private static Optional<Token> getMethodName(BSLParser.AccessCallContext ctx) {
+    return Optional.of(ctx.methodCall().methodName().getStart());
   }
 
-  private static Token getMethodName(BSLParser.ComplexIdentifierContext ctx) {
+  private static Optional<Token> getMethodName(BSLParser.ComplexIdentifierContext ctx) {
     return getMethodName(ctx.modifier());
   }
 
-  @CheckForNull
-  private static Token getMethodName(List<? extends BSLParser.ModifierContext> modifiers) {
+  private static Optional<Token> getMethodName(List<? extends BSLParser.ModifierContext> modifiers) {
     return modifiers.stream()
       .map(BSLParser.ModifierContext::accessCall)
       .filter(Objects::nonNull)
       .map(DeprecatedMethodCallDiagnostic::getMethodName)
       .findFirst()
-      .orElse(null);
+      .orElse(Optional.empty());
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
index 29bd1048dcb..6b88da2fd0a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java
@@ -44,7 +44,6 @@ public String getMdoRef(DocumentContext documentContext, BSLParser.CallStatement
     return getMdoRef(documentContext, callStatement.IDENTIFIER(), callStatement.modifier());
   }
 
-
   public String getMdoRef(DocumentContext documentContext, BSLParser.ComplexIdentifierContext complexIdentifier) {
     return getMdoRef(documentContext, complexIdentifier.IDENTIFIER(), complexIdentifier.modifier());
   }
diff --git a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
index 11c03a727c6..7447044902c 100644
--- a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
@@ -1,27 +1,32 @@
 
-ПервыйОбщийМодуль.УстаревшаяПроцедура();
+ПервыйОбщийМодуль.УстаревшаяПроцедура(); // <--
 ПервыйОбщийМодуль.НеУстаревшаяПроцедура();
 
-ПервыйОбщийМодуль.УстаревшаяФункция();
+ПервыйОбщийМодуль.УстаревшаяФункция(); // <--
 ПервыйОбщийМодуль.НеУстаревшаяФункция();
 
-А = ПервыйОбщийМодуль.УстаревшаяФункция();
+А = ПервыйОбщийМодуль.УстаревшаяФункция(); // <--
 А = ПервыйОбщийМодуль.НеУстаревшаяФункция();
 
-Если ПервыйОбщийМодуль.УстаревшаяФункция() Тогда
+Если ПервыйОбщийМодуль.УстаревшаяФункция() Тогда // <--
 КонецЕсли;
 
 Если ПервыйОбщийМодуль.НеУстаревшаяФункция() Тогда
 КонецЕсли;
 
-РегистрыСведений.РегистрСведений1.УстаревшаяПроцедура();
+РегистрыСведений.РегистрСведений1.УстаревшаяПроцедура(); // <--
 РегистрыСведений.РегистрСведений1.НеУстаревшаяПроцедура();
 
-А = РегистрыСведений.РегистрСведений1.УстаревшаяФункция();
+А = РегистрыСведений.РегистрСведений1.УстаревшаяФункция(); // <--
 А = РегистрыСведений.РегистрСведений1.НеУстаревшаяФункция();
 
-Если РегистрыСведений.РегистрСведений1.УстаревшаяФункция() Тогда
+Если РегистрыСведений.РегистрСведений1.УстаревшаяФункция() Тогда // <--
 КонецЕсли;
 
 Если РегистрыСведений.РегистрСведений1.НеУстаревшаяФункция() Тогда
-КонецЕсли;
\ No newline at end of file
+КонецЕсли;
+
+// Устарела.
+Процедура УстаревшаяПроцедура()
+    ПервыйОбщийМодуль.УстаревшаяПроцедура(); // нет срабатывания, т.к. вызов из устаревшей процедуры
+КонецПроцедуры
\ No newline at end of file

From b24e495e6fd8da3bdb936eb7d7d69cdaf5a12a76 Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 17:13:41 +0300
Subject: [PATCH 333/444] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BB=20=D1=81=D1=80=D0=B0=D0=B7=D1=83=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BB=D0=B8=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/CanonicalSpellingKeywordsDiagnostic.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 5fde40d6a94..01f86bc9217 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -315,6 +315,6 @@ public List<CodeAction> getQuickFixes(
   }
 
   private static List<String> makeListKeywords(String... keyword) {
-    return Arrays.asList(keyword);
+    return List.of(keyword);
   }
 }

From 1247236f6342676605cc151ca064d60bfb84b98e Mon Sep 17 00:00:00 2001
From: Maxmov Valery <maximovvalery@gmail.com>
Date: Wed, 20 May 2020 17:20:27 +0300
Subject: [PATCH 334/444] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanonicalSpellingKeywordsDiagnostic.java  | 133 +++++++++---------
 1 file changed, 64 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 01f86bc9217..3fa75f80ce0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -38,7 +38,6 @@
 import org.eclipse.lsp4j.TextEdit;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -71,86 +70,86 @@ private static Map<Integer, List<String>> getDefaultPreset() {
 
     Map<Integer, List<String>> result = new HashMap<>();
 
-    result.put(BSLParser.IF_KEYWORD, makeListKeywords(Keywords.IF_RU, Keywords.IF_EN));
-    result.put(BSLParser.THEN_KEYWORD, makeListKeywords(Keywords.THEN_RU, Keywords.THEN_EN));
-    result.put(BSLParser.ELSE_KEYWORD, makeListKeywords(Keywords.ELSE_RU, Keywords.ELSE_EN));
-    result.put(BSLParser.ELSIF_KEYWORD, makeListKeywords(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
-    result.put(BSLParser.ENDIF_KEYWORD, makeListKeywords(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
-    result.put(BSLParser.FOR_KEYWORD, makeListKeywords(Keywords.FOR_RU, Keywords.FOR_EN));
-    result.put(BSLParser.EACH_KEYWORD, makeListKeywords(
+    result.put(BSLParser.IF_KEYWORD, List.of(Keywords.IF_RU, Keywords.IF_EN));
+    result.put(BSLParser.THEN_KEYWORD, List.of(Keywords.THEN_RU, Keywords.THEN_EN));
+    result.put(BSLParser.ELSE_KEYWORD, List.of(Keywords.ELSE_RU, Keywords.ELSE_EN));
+    result.put(BSLParser.ELSIF_KEYWORD, List.of(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
+    result.put(BSLParser.ENDIF_KEYWORD, List.of(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
+    result.put(BSLParser.FOR_KEYWORD, List.of(Keywords.FOR_RU, Keywords.FOR_EN));
+    result.put(BSLParser.EACH_KEYWORD, List.of(
       Keywords.EACH_RU, Keywords.EACH_LO_RU, Keywords.EACH_EN, Keywords.EACH_LO_EN));
-    result.put(BSLParser.IN_KEYWORD, makeListKeywords(Keywords.IN_RU, Keywords.IN_EN));
-    result.put(BSLParser.DO_KEYWORD, makeListKeywords(Keywords.DO_RU, Keywords.DO_EN));
-    result.put(BSLParser.WHILE_KEYWORD, makeListKeywords(Keywords.WHILE_RU, Keywords.WHILE_EN));
-    result.put(BSLParser.BREAK_KEYWORD, makeListKeywords(Keywords.BREAK_RU, Keywords.BREAK_EN));
-    result.put(BSLParser.CONTINUE_KEYWORD, makeListKeywords(Keywords.CONTINUE_RU, Keywords.CONTINUE_EN));
-    result.put(BSLParser.ENDDO_KEYWORD, makeListKeywords(Keywords.END_DO_RU, Keywords.END_DO_EN));
-    result.put(BSLParser.TO_KEYWORD, makeListKeywords(Keywords.TO_RU, Keywords.TO_EN));
-    result.put(BSLParser.PROCEDURE_KEYWORD, makeListKeywords(Keywords.PROCEDURE_RU, Keywords.PROCEDURE_EN));
-    result.put(BSLParser.VAL_KEYWORD, makeListKeywords(Keywords.VAL_RU, Keywords.VAL_EN));
-    result.put(BSLParser.EXPORT_KEYWORD, makeListKeywords(Keywords.EXPORT_RU, Keywords.EXPORT_EN));
-    result.put(BSLParser.VAR_KEYWORD, makeListKeywords(Keywords.VAR_RU, Keywords.VAR_EN));
-    result.put(BSLParser.TRY_KEYWORD, makeListKeywords(Keywords.TRY_RU, Keywords.TRY_EN));
-    result.put(BSLParser.EXECUTE_KEYWORD, makeListKeywords(Keywords.EXECUTE_RU, Keywords.EXECUTE_EN));
-    result.put(BSLParser.RETURN_KEYWORD, makeListKeywords(Keywords.RETURN_RU, Keywords.RETURN_EN));
-    result.put(BSLParser.TRUE, makeListKeywords(Keywords.TRUE_RU, Keywords.TRUE_EN));
-    result.put(BSLParser.EXCEPT_KEYWORD, makeListKeywords(Keywords.EXCEPT_RU, Keywords.EXCEPT_EN));
-    result.put(BSLParser.RAISE_KEYWORD, makeListKeywords(Keywords.RAISE_RU, Keywords.RAISE_EN));
-    result.put(BSLParser.ENDTRY_KEYWORD, makeListKeywords(Keywords.END_TRY_RU, Keywords.END_TRY_EN));
-    result.put(BSLParser.ENDPROCEDURE_KEYWORD, makeListKeywords(Keywords.END_PROCEDURE_RU, Keywords.END_PROCEDURE_EN));
-    result.put(BSLParser.FUNCTION_KEYWORD, makeListKeywords(Keywords.FUNCTION_RU, Keywords.FUNCTION_EN));
-    result.put(BSLParser.ENDFUNCTION_KEYWORD, makeListKeywords(Keywords.END_FUNCTION_RU, Keywords.END_FUNCTION_EN));
-    result.put(BSLParser.FALSE, makeListKeywords(Keywords.FALSE_RU, Keywords.FALSE_EN));
-    result.put(BSLParser.ADDHANDLER_KEYWORD, makeListKeywords(Keywords.ADD_HANDLER_RU, Keywords.ADD_HANDLER_EN));
-    result.put(BSLParser.REMOVEHANDLER_KEYWORD, makeListKeywords(
+    result.put(BSLParser.IN_KEYWORD, List.of(Keywords.IN_RU, Keywords.IN_EN));
+    result.put(BSLParser.DO_KEYWORD, List.of(Keywords.DO_RU, Keywords.DO_EN));
+    result.put(BSLParser.WHILE_KEYWORD, List.of(Keywords.WHILE_RU, Keywords.WHILE_EN));
+    result.put(BSLParser.BREAK_KEYWORD, List.of(Keywords.BREAK_RU, Keywords.BREAK_EN));
+    result.put(BSLParser.CONTINUE_KEYWORD, List.of(Keywords.CONTINUE_RU, Keywords.CONTINUE_EN));
+    result.put(BSLParser.ENDDO_KEYWORD, List.of(Keywords.END_DO_RU, Keywords.END_DO_EN));
+    result.put(BSLParser.TO_KEYWORD, List.of(Keywords.TO_RU, Keywords.TO_EN));
+    result.put(BSLParser.PROCEDURE_KEYWORD, List.of(Keywords.PROCEDURE_RU, Keywords.PROCEDURE_EN));
+    result.put(BSLParser.VAL_KEYWORD, List.of(Keywords.VAL_RU, Keywords.VAL_EN));
+    result.put(BSLParser.EXPORT_KEYWORD, List.of(Keywords.EXPORT_RU, Keywords.EXPORT_EN));
+    result.put(BSLParser.VAR_KEYWORD, List.of(Keywords.VAR_RU, Keywords.VAR_EN));
+    result.put(BSLParser.TRY_KEYWORD, List.of(Keywords.TRY_RU, Keywords.TRY_EN));
+    result.put(BSLParser.EXECUTE_KEYWORD, List.of(Keywords.EXECUTE_RU, Keywords.EXECUTE_EN));
+    result.put(BSLParser.RETURN_KEYWORD, List.of(Keywords.RETURN_RU, Keywords.RETURN_EN));
+    result.put(BSLParser.TRUE, List.of(Keywords.TRUE_RU, Keywords.TRUE_EN));
+    result.put(BSLParser.EXCEPT_KEYWORD, List.of(Keywords.EXCEPT_RU, Keywords.EXCEPT_EN));
+    result.put(BSLParser.RAISE_KEYWORD, List.of(Keywords.RAISE_RU, Keywords.RAISE_EN));
+    result.put(BSLParser.ENDTRY_KEYWORD, List.of(Keywords.END_TRY_RU, Keywords.END_TRY_EN));
+    result.put(BSLParser.ENDPROCEDURE_KEYWORD, List.of(Keywords.END_PROCEDURE_RU, Keywords.END_PROCEDURE_EN));
+    result.put(BSLParser.FUNCTION_KEYWORD, List.of(Keywords.FUNCTION_RU, Keywords.FUNCTION_EN));
+    result.put(BSLParser.ENDFUNCTION_KEYWORD, List.of(Keywords.END_FUNCTION_RU, Keywords.END_FUNCTION_EN));
+    result.put(BSLParser.FALSE, List.of(Keywords.FALSE_RU, Keywords.FALSE_EN));
+    result.put(BSLParser.ADDHANDLER_KEYWORD, List.of(Keywords.ADD_HANDLER_RU, Keywords.ADD_HANDLER_EN));
+    result.put(BSLParser.REMOVEHANDLER_KEYWORD, List.of(
       Keywords.REMOVE_HANDLER_RU, Keywords.REMOVE_HANDLER_EN));
-    result.put(BSLParser.GOTO_KEYWORD, makeListKeywords(Keywords.GOTO_RU, Keywords.GOTO_EN));
-    result.put(BSLParser.AND_KEYWORD, makeListKeywords(
+    result.put(BSLParser.GOTO_KEYWORD, List.of(Keywords.GOTO_RU, Keywords.GOTO_EN));
+    result.put(BSLParser.AND_KEYWORD, List.of(
       Keywords.AND_RU, Keywords.AND_UP_EN, Keywords.AND_EN));
-    result.put(BSLParser.OR_KEYWORD, makeListKeywords(
+    result.put(BSLParser.OR_KEYWORD, List.of(
       Keywords.OR_RU, Keywords.OR_UP_RU, Keywords.OR_EN, Keywords.OR_UP_EN));
-    result.put(BSLParser.NOT_KEYWORD, makeListKeywords(
+    result.put(BSLParser.NOT_KEYWORD, List.of(
       Keywords.NOT_RU, Keywords.NOT_UP_RU, Keywords.NOT_EN, Keywords.NOT_UP_EN));
-    result.put(BSLParser.NEW_KEYWORD, makeListKeywords(Keywords.NEW_RU, Keywords.NEW_EN));
-    result.put(BSLParser.UNDEFINED, makeListKeywords(Keywords.UNDEFINED_RU, Keywords.UNDEFINED_EN));
-    result.put(BSLParser.PREPROC_REGION, makeListKeywords(Keywords.REGION_RU, Keywords.REGION_EN));
-    result.put(BSLParser.PREPROC_END_REGION, makeListKeywords(Keywords.ENDREGION_RU, Keywords.ENDREGION_EN));
-    result.put(BSLParser.PREPROC_IF_KEYWORD, makeListKeywords(Keywords.IF_RU, Keywords.IF_EN));
-    result.put(BSLParser.PREPROC_THEN_KEYWORD, makeListKeywords(Keywords.THEN_RU, Keywords.THEN_EN));
-    result.put(BSLParser.PREPROC_ELSIF_KEYWORD, makeListKeywords(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
-    result.put(BSLParser.PREPROC_ELSE_KEYWORD, makeListKeywords(Keywords.ELSE_RU, Keywords.ELSE_EN));
-    result.put(BSLParser.PREPROC_ENDIF_KEYWORD, makeListKeywords(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
-    result.put(BSLParser.PREPROC_OR_KEYWORD, makeListKeywords(
+    result.put(BSLParser.NEW_KEYWORD, List.of(Keywords.NEW_RU, Keywords.NEW_EN));
+    result.put(BSLParser.UNDEFINED, List.of(Keywords.UNDEFINED_RU, Keywords.UNDEFINED_EN));
+    result.put(BSLParser.PREPROC_REGION, List.of(Keywords.REGION_RU, Keywords.REGION_EN));
+    result.put(BSLParser.PREPROC_END_REGION, List.of(Keywords.ENDREGION_RU, Keywords.ENDREGION_EN));
+    result.put(BSLParser.PREPROC_IF_KEYWORD, List.of(Keywords.IF_RU, Keywords.IF_EN));
+    result.put(BSLParser.PREPROC_THEN_KEYWORD, List.of(Keywords.THEN_RU, Keywords.THEN_EN));
+    result.put(BSLParser.PREPROC_ELSIF_KEYWORD, List.of(Keywords.ELSIF_RU, Keywords.ELSIF_EN));
+    result.put(BSLParser.PREPROC_ELSE_KEYWORD, List.of(Keywords.ELSE_RU, Keywords.ELSE_EN));
+    result.put(BSLParser.PREPROC_ENDIF_KEYWORD, List.of(Keywords.ENDIF_RU, Keywords.ENDIF_EN));
+    result.put(BSLParser.PREPROC_OR_KEYWORD, List.of(
       Keywords.OR_RU, Keywords.OR_UP_RU, Keywords.OR_EN, Keywords.OR_UP_EN));
-    result.put(BSLParser.PREPROC_AND_KEYWORD, makeListKeywords(
+    result.put(BSLParser.PREPROC_AND_KEYWORD, List.of(
       Keywords.AND_RU, Keywords.AND_EN, Keywords.AND_UP_EN));
-    result.put(BSLParser.PREPROC_NOT_KEYWORD, makeListKeywords(
+    result.put(BSLParser.PREPROC_NOT_KEYWORD, List.of(
       Keywords.NOT_RU, Keywords.NOT_UP_RU, Keywords.NOT_EN, Keywords.NOT_UP_EN));
-    result.put(BSLParser.PREPROC_SERVER_SYMBOL, makeListKeywords(Keywords.SERVER_RU, Keywords.SERVER_EN));
-    result.put(BSLParser.PREPROC_CLIENT_SYMBOL, makeListKeywords(Keywords.CLIENT_RU, Keywords.CLIENT_EN));
-    result.put(BSLParser.PREPROC_MOBILEAPPCLIENT_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_SERVER_SYMBOL, List.of(Keywords.SERVER_RU, Keywords.SERVER_EN));
+    result.put(BSLParser.PREPROC_CLIENT_SYMBOL, List.of(Keywords.CLIENT_RU, Keywords.CLIENT_EN));
+    result.put(BSLParser.PREPROC_MOBILEAPPCLIENT_SYMBOL, List.of(
       Keywords.MOBILE_APP_CLIENT_RU, Keywords.MOBILE_APP_CLIENT_EN));
-    result.put(BSLParser.PREPROC_MOBILEAPPSERVER_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_MOBILEAPPSERVER_SYMBOL, List.of(
       Keywords.MOBILE_APP_SERVER_RU, Keywords.MOBILE_APP_SERVER_EN));
-    result.put(BSLParser.PREPROC_MOBILECLIENT_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_MOBILECLIENT_SYMBOL, List.of(
       Keywords.MOBILE_CLIENT_RU, Keywords.MOBILE_CLIENT_EN));
-    result.put(BSLParser.PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL, List.of(
       Keywords.THICK_CLIENT_ORDINARY_APPLICATION_RU, Keywords.THICK_CLIENT_ORDINARY_APPLICATION_EN));
-    result.put(BSLParser.PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL, List.of(
       Keywords.THICK_CLIENT_MANAGED_APPLICATION_RU, Keywords.THICK_CLIENT_MANAGED_APPLICATION_EN));
-    result.put(BSLParser.PREPROC_EXTERNALCONNECTION_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_EXTERNALCONNECTION_SYMBOL, List.of(
       Keywords.EXTERNAL_CONNECTION_RU, Keywords.EXTERNAL_CONNECTION_EN));
-    result.put(BSLParser.PREPROC_THINCLIENT_SYMBOL, makeListKeywords(Keywords.THIN_CLIENT_RU, Keywords.THIN_CLIENT_EN));
-    result.put(BSLParser.PREPROC_WEBCLIENT_SYMBOL, makeListKeywords(Keywords.WEB_CLIENT_RU, Keywords.WEB_CLIENT_EN));
-    result.put(BSLParser.PREPROC_ATCLIENT_SYMBOL, makeListKeywords(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
-    result.put(BSLParser.PREPROC_ATSERVER_SYMBOL, makeListKeywords(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
-    result.put(BSLParser.ANNOTATION_ATCLIENT_SYMBOL, makeListKeywords(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
-    result.put(BSLParser.ANNOTATION_ATSERVER_SYMBOL, makeListKeywords(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
-    result.put(BSLParser.ANNOTATION_ATSERVERNOCONTEXT_SYMBOL, makeListKeywords(
+    result.put(BSLParser.PREPROC_THINCLIENT_SYMBOL, List.of(Keywords.THIN_CLIENT_RU, Keywords.THIN_CLIENT_EN));
+    result.put(BSLParser.PREPROC_WEBCLIENT_SYMBOL, List.of(Keywords.WEB_CLIENT_RU, Keywords.WEB_CLIENT_EN));
+    result.put(BSLParser.PREPROC_ATCLIENT_SYMBOL, List.of(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
+    result.put(BSLParser.PREPROC_ATSERVER_SYMBOL, List.of(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
+    result.put(BSLParser.ANNOTATION_ATCLIENT_SYMBOL, List.of(Keywords.AT_CLIENT_RU, Keywords.AT_CLIENT_EN));
+    result.put(BSLParser.ANNOTATION_ATSERVER_SYMBOL, List.of(Keywords.AT_SERVER_RU, Keywords.AT_SERVER_EN));
+    result.put(BSLParser.ANNOTATION_ATSERVERNOCONTEXT_SYMBOL, List.of(
       Keywords.AT_SERVER_NO_CONTEXT_RU, Keywords.AT_SERVER_NO_CONTEXT_EN));
-    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVERNOCONTEXT_SYMBOL, makeListKeywords(
+    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVERNOCONTEXT_SYMBOL, List.of(
       Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_RU, Keywords.AT_CLIENT_AT_SERVER_NO_CONTEXT_EN));
-    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVER_SYMBOL, makeListKeywords(
+    result.put(BSLParser.ANNOTATION_ATCLIENTATSERVER_SYMBOL, List.of(
       Keywords.AT_CLIENT_AT_SERVER_RU, Keywords.AT_CLIENT_AT_SERVER_EN));
 
     return result;
@@ -313,8 +312,4 @@ public List<CodeAction> getQuickFixes(
     );
 
   }
-
-  private static List<String> makeListKeywords(String... keyword) {
-    return List.of(keyword);
-  }
 }

From 932768b18930e37e85a1762c7cd010e766d5c30a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 20 May 2020 18:34:55 +0300
Subject: [PATCH 335/444] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8F=D1=85=20=D0=BC=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2=20=D0=B8=20=D0=BE=D0=B1=D1=89=D0=B8?=
 =?UTF-8?q?=D1=85=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DeprecatedMethodCallDiagnostic.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index f327085ece6..33363526649 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -32,10 +32,12 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -99,7 +101,9 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
     var documentContexts = documentContext.getServerContext().getDocuments(mdoRef);
     String methodNameText = methodName.getText();
 
-    documentContexts.values().stream()
+    documentContexts.entrySet().stream()
+      .filter(entry -> entry.getKey() == ModuleType.ManagerModule || entry.getKey() == ModuleType.CommonModule)
+      .map(Map.Entry::getValue)
       .map(DocumentContext::getSymbolTree)
       .flatMap(symbolTree -> symbolTree.getMethods().stream())
       .filter(methodSymbol -> methodSymbol.isDeprecated()

From 8501f7f6c5657590f4e1bb1eeba504120310e3f0 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 11:10:43 +0300
Subject: [PATCH 336/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/NewDiagnosticTemplates/Template_en.md | 2 +-
 gradle/NewDiagnosticTemplates/Template_ru.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/NewDiagnosticTemplates/Template_en.md b/gradle/NewDiagnosticTemplates/Template_en.md
index 4e7e0f78ada..0839d6e982d 100644
--- a/gradle/NewDiagnosticTemplates/Template_en.md
+++ b/gradle/NewDiagnosticTemplates/Template_en.md
@@ -16,7 +16,7 @@
 <!-- Примеры источников
 
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Полезная информация: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
diff --git a/gradle/NewDiagnosticTemplates/Template_ru.md b/gradle/NewDiagnosticTemplates/Template_ru.md
index 6fcb1ecdbe5..525de0e9a85 100644
--- a/gradle/NewDiagnosticTemplates/Template_ru.md
+++ b/gradle/NewDiagnosticTemplates/Template_ru.md
@@ -16,7 +16,7 @@
 <!-- Примеры источников
 
 * Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Полезная информация: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты

From 284c4493d4f33e073efb44a82b8e528c229923f1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 11:11:07 +0300
Subject: [PATCH 337/444] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BA=D1=83?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B8=20=D1=81=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Иногда сбивается рендер маркдауна в документации
---
 docs/diagnostics/CodeBlockBeforeSub.md                     | 4 ----
 docs/diagnostics/CodeOutOfRegion.md                        | 4 ----
 docs/diagnostics/CommonModuleAssign.md                     | 4 ----
 docs/diagnostics/CommonModuleNameCached.md                 | 4 ----
 docs/diagnostics/CommonModuleNameClient.md                 | 4 ----
 docs/diagnostics/CommonModuleNameClientServer.md           | 4 ----
 docs/diagnostics/CommonModuleNameFullAccess.md             | 4 ----
 docs/diagnostics/CommonModuleNameGlobal.md                 | 4 ----
 docs/diagnostics/CommonModuleNameGlobalClient.md           | 4 ----
 docs/diagnostics/CommonModuleNameServerCall.md             | 4 ----
 docs/diagnostics/CyclomaticComplexity.md                   | 4 ----
 docs/diagnostics/DeprecatedAttributes8312.md               | 4 ----
 docs/diagnostics/DeprecatedCurrentDate.md                  | 4 ----
 docs/diagnostics/DeprecatedMethods8310.md                  | 4 ----
 docs/diagnostics/DeprecatedMethods8317.md                  | 4 ----
 docs/diagnostics/DeprecatedTypeManagedForm.md              | 4 ----
 docs/diagnostics/DuplicateRegion.md                        | 4 ----
 docs/diagnostics/ExecuteExternalCode.md                    | 4 ----
 docs/diagnostics/ExecuteExternalCodeInCommonModule.md      | 4 ----
 docs/diagnostics/FormDataToValue.md                        | 4 ----
 docs/diagnostics/FunctionReturnsSamePrimitive.md           | 4 ----
 docs/diagnostics/GetFormMethod.md                          | 4 ----
 docs/diagnostics/IsInRoleMethodDiagnostic.md               | 4 ----
 docs/diagnostics/MissingVariablesDescription.md            | 4 ----
 docs/diagnostics/NestedFunctionInParameters.md             | 4 ----
 docs/diagnostics/NonStandardRegion.md                      | 4 ----
 docs/diagnostics/OSUsersMethod.md                          | 4 ----
 docs/diagnostics/UnsafeSafeModeMethodCall.md               | 4 ----
 docs/diagnostics/UsingExternalCodeTools.md                 | 4 ----
 docs/diagnostics/WrongUseOfRollbackTransactionMethod.md    | 4 ----
 docs/en/diagnostics/CachedPublic.md                        | 4 ----
 docs/en/diagnostics/CodeBlockBeforeSub.md                  | 4 ----
 docs/en/diagnostics/CodeOutOfRegion.md                     | 4 ----
 docs/en/diagnostics/CommonModuleAssign.md                  | 4 ----
 docs/en/diagnostics/CommonModuleInvalidType.md             | 4 ----
 docs/en/diagnostics/CommonModuleNameCached.md              | 4 ----
 docs/en/diagnostics/CommonModuleNameClient.md              | 4 ----
 docs/en/diagnostics/CommonModuleNameClientServer.md        | 4 ----
 docs/en/diagnostics/CommonModuleNameFullAccess.md          | 4 ----
 docs/en/diagnostics/CommonModuleNameGlobal.md              | 4 ----
 docs/en/diagnostics/CommonModuleNameGlobalClient.md        | 4 ----
 docs/en/diagnostics/CommonModuleNameServerCall.md          | 4 ----
 docs/en/diagnostics/CommonModuleNameWords.md               | 4 ----
 docs/en/diagnostics/CyclomaticComplexity.md                | 4 ----
 docs/en/diagnostics/DataExchangeLoading.md                 | 4 ----
 docs/en/diagnostics/DeprecatedAttributes8312.md            | 4 ----
 docs/en/diagnostics/DeprecatedCurrentDate.md               | 4 ----
 docs/en/diagnostics/DeprecatedMethods8310.md               | 4 ----
 docs/en/diagnostics/DeprecatedMethods8317.md               | 4 ----
 docs/en/diagnostics/DeprecatedTypeManagedForm.md           | 4 ----
 docs/en/diagnostics/DuplicateRegion.md                     | 4 ----
 docs/en/diagnostics/EmptyRegion.md                         | 4 ----
 docs/en/diagnostics/ExcessiveAutoTestCheck.md              | 4 ----
 docs/en/diagnostics/ExecuteExternalCode.md                 | 4 ----
 docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md   | 4 ----
 docs/en/diagnostics/FormDataToValue.md                     | 4 ----
 docs/en/diagnostics/FunctionReturnsSamePrimitive.md        | 4 ----
 docs/en/diagnostics/GetFormMethod.md                       | 4 ----
 docs/en/diagnostics/IsInRoleMethodDiagnostic.md            | 4 ----
 docs/en/diagnostics/MissingVariablesDescription.md         | 4 ----
 docs/en/diagnostics/NestedFunctionInParameters.md          | 4 ----
 docs/en/diagnostics/NonStandardRegion.md                   | 4 ----
 docs/en/diagnostics/OSUsersMethod.md                       | 4 ----
 docs/en/diagnostics/TempFilesDir.md                        | 4 ----
 docs/en/diagnostics/ThisObjectAssign.md                    | 4 ----
 docs/en/diagnostics/TooManyReturns.md                      | 4 ----
 docs/en/diagnostics/UnsafeSafeModeMethodCall.md            | 4 ----
 docs/en/diagnostics/UsingExternalCodeTools.md              | 4 ----
 docs/en/diagnostics/WrongUseOfRollbackTransactionMethod.md | 4 ----
 69 files changed, 276 deletions(-)

diff --git a/docs/diagnostics/CodeBlockBeforeSub.md b/docs/diagnostics/CodeBlockBeforeSub.md
index 237ffc66e3a..f6b06da40c4 100644
--- a/docs/diagnostics/CodeBlockBeforeSub.md
+++ b/docs/diagnostics/CodeBlockBeforeSub.md
@@ -31,11 +31,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Структура модуля](https://its.1c.ru/db/v8std/content/455/hdoc)
 
diff --git a/docs/diagnostics/CodeOutOfRegion.md b/docs/diagnostics/CodeOutOfRegion.md
index a2cdcf5203a..45199da1360 100644
--- a/docs/diagnostics/CodeOutOfRegion.md
+++ b/docs/diagnostics/CodeOutOfRegion.md
@@ -16,11 +16,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Источник [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/diagnostics/CommonModuleAssign.md b/docs/diagnostics/CommonModuleAssign.md
index 534c41d57d0..472cccb60ac 100644
--- a/docs/diagnostics/CommonModuleAssign.md
+++ b/docs/diagnostics/CommonModuleAssign.md
@@ -17,11 +17,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
 
diff --git a/docs/diagnostics/CommonModuleNameCached.md b/docs/diagnostics/CommonModuleNameCached.md
index 1d8a065d602..df44e5fc8b7 100644
--- a/docs/diagnostics/CommonModuleNameCached.md
+++ b/docs/diagnostics/CommonModuleNameCached.md
@@ -19,11 +19,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.3)
 
diff --git a/docs/diagnostics/CommonModuleNameClient.md b/docs/diagnostics/CommonModuleNameClient.md
index b191ae1bfb0..1f799e4e82c 100644
--- a/docs/diagnostics/CommonModuleNameClient.md
+++ b/docs/diagnostics/CommonModuleNameClient.md
@@ -27,11 +27,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.3)
 
diff --git a/docs/diagnostics/CommonModuleNameClientServer.md b/docs/diagnostics/CommonModuleNameClientServer.md
index 7e0f02a37a4..d42881f064f 100644
--- a/docs/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/diagnostics/CommonModuleNameClientServer.md
@@ -24,11 +24,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Правила создания общих модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
 
diff --git a/docs/diagnostics/CommonModuleNameFullAccess.md b/docs/diagnostics/CommonModuleNameFullAccess.md
index 7db398c816b..4052b7924c6 100644
--- a/docs/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/diagnostics/CommonModuleNameFullAccess.md
@@ -18,11 +18,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.2)
 
diff --git a/docs/diagnostics/CommonModuleNameGlobal.md b/docs/diagnostics/CommonModuleNameGlobal.md
index bfa956f7931..25618acfb89 100644
--- a/docs/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/diagnostics/CommonModuleNameGlobal.md
@@ -18,11 +18,7 @@
  
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.1)
 
diff --git a/docs/diagnostics/CommonModuleNameGlobalClient.md b/docs/diagnostics/CommonModuleNameGlobalClient.md
index 406095c539e..e3cefc5d0d9 100644
--- a/docs/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/diagnostics/CommonModuleNameGlobalClient.md
@@ -22,11 +22,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 
 [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.1)
diff --git a/docs/diagnostics/CommonModuleNameServerCall.md b/docs/diagnostics/CommonModuleNameServerCall.md
index 9cbf5661dfa..c26aa037b1c 100644
--- a/docs/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/diagnostics/CommonModuleNameServerCall.md
@@ -24,11 +24,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
 
diff --git a/docs/diagnostics/CyclomaticComplexity.md b/docs/diagnostics/CyclomaticComplexity.md
index b63b4e3cd53..191d0cf5287 100644
--- a/docs/diagnostics/CyclomaticComplexity.md
+++ b/docs/diagnostics/CyclomaticComplexity.md
@@ -76,11 +76,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Cyclomatic Complexity PHP](https://pdepend.org/documentation/software-metrics/cyclomatic-complexity.html)
 * [Цикломатическая сложность](https://ru.wikipedia.org/wiki/%D0%A6%D0%B8%D0%BA%D0%BB%D0%BE%D0%BC%D0%B0%D1%82%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F_%D1%81%D0%BB%D0%BE%D0%B6%D0%BD%D0%BE%D1%81%D1%82%D1%8C)
diff --git a/docs/diagnostics/DeprecatedAttributes8312.md b/docs/diagnostics/DeprecatedAttributes8312.md
index da880d16fc3..a44bdca57b9 100644
--- a/docs/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/diagnostics/DeprecatedAttributes8312.md
@@ -40,11 +40,7 @@
   
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Источник: [Описание изменений платформы 8.3.12](https://dl04.1c.ru/content/Platform/8_3_12_1714/1cv8upd_8_3_12_1714.htm)
 
 ## Сниппеты
diff --git a/docs/diagnostics/DeprecatedCurrentDate.md b/docs/diagnostics/DeprecatedCurrentDate.md
index 1709042e12b..fc28df154e2 100644
--- a/docs/diagnostics/DeprecatedCurrentDate.md
+++ b/docs/diagnostics/DeprecatedCurrentDate.md
@@ -25,11 +25,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Источник: [Создание и изменение объектов метаданных. Работа в разных часовых поясах](https://its.1c.ru/db/v8std/content/643/hdoc)
 
diff --git a/docs/diagnostics/DeprecatedMethods8310.md b/docs/diagnostics/DeprecatedMethods8310.md
index 2fdf6d3e965..8873320fe03 100644
--- a/docs/diagnostics/DeprecatedMethods8310.md
+++ b/docs/diagnostics/DeprecatedMethods8310.md
@@ -20,11 +20,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Источник: [Список изменений платформы 8.3.10:](https://dl03.1c.ru/content/Platform/8_3_10_2699/1cv8upd.htm)
 
 ## Сниппеты
diff --git a/docs/diagnostics/DeprecatedMethods8317.md b/docs/diagnostics/DeprecatedMethods8317.md
index b1524740c14..ea424edb4b4 100644
--- a/docs/diagnostics/DeprecatedMethods8317.md
+++ b/docs/diagnostics/DeprecatedMethods8317.md
@@ -17,11 +17,7 @@
 Необходимо использовать одноименные методы объекта ОбработкаОшибок.
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Источник: [Описание изменений платформы 8.3.17](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm#27f2dc70-f0cf-11e9-8371-0050569f678a)
 
 ## Сниппеты
diff --git a/docs/diagnostics/DeprecatedTypeManagedForm.md b/docs/diagnostics/DeprecatedTypeManagedForm.md
index de6bfc58456..06c1ecc3214 100644
--- a/docs/diagnostics/DeprecatedTypeManagedForm.md
+++ b/docs/diagnostics/DeprecatedTypeManagedForm.md
@@ -11,11 +11,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Источник: [Описание обновлений](https://dl03.1c.ru/content/Platform/8_3_16_1148/1cv8upd_8_3_16_1148.htm)
 
 ## Сниппеты
diff --git a/docs/diagnostics/DuplicateRegion.md b/docs/diagnostics/DuplicateRegion.md
index 2a1f644ecb5..6e21a07c87a 100644
--- a/docs/diagnostics/DuplicateRegion.md
+++ b/docs/diagnostics/DuplicateRegion.md
@@ -15,11 +15,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Источник [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/diagnostics/ExecuteExternalCode.md b/docs/diagnostics/ExecuteExternalCode.md
index c68e6c22604..b47a93f73ab 100644
--- a/docs/diagnostics/ExecuteExternalCode.md
+++ b/docs/diagnostics/ExecuteExternalCode.md
@@ -18,11 +18,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Ограничения на использование Выполнить и Вычислить на сервере](https://its.1c.ru/db/v8std#content:770:hdoc)
 
diff --git a/docs/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/diagnostics/ExecuteExternalCodeInCommonModule.md
index 23d931e886f..9d015bc5d2a 100644
--- a/docs/diagnostics/ExecuteExternalCodeInCommonModule.md
+++ b/docs/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -18,11 +18,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Ограничения на использование Выполнить и Вычислить на сервере](https://its.1c.ru/db/v8std#content:770:hdoc)
 
diff --git a/docs/diagnostics/FormDataToValue.md b/docs/diagnostics/FormDataToValue.md
index bf527c70300..e581e29940b 100644
--- a/docs/diagnostics/FormDataToValue.md
+++ b/docs/diagnostics/FormDataToValue.md
@@ -20,11 +20,7 @@
 ```
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Источник: [Использование РеквизитФормыВЗначение и ДанныеФормыВЗначение](https://its.1c.ru/db/v8std#content:409:hdoc)
 
 ## Сниппеты
diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index fe18bf533df..d1cd7ea76cd 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -70,11 +70,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Сниппеты
 
diff --git a/docs/diagnostics/GetFormMethod.md b/docs/diagnostics/GetFormMethod.md
index 221440d9c6f..6d7c71a0ec4 100644
--- a/docs/diagnostics/GetFormMethod.md
+++ b/docs/diagnostics/GetFormMethod.md
@@ -25,11 +25,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Источник: [Стандарты разработки](https://its.1c.ru/db/v8std/content/404/hdoc)
 
 ## Сниппеты
diff --git a/docs/diagnostics/IsInRoleMethodDiagnostic.md b/docs/diagnostics/IsInRoleMethodDiagnostic.md
index 6c776a63cb8..64b3ea0d390 100644
--- a/docs/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/diagnostics/IsInRoleMethodDiagnostic.md
@@ -37,11 +37,7 @@
 ```
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Источник: [Стандарт: Проверка прав доступа](https://its.1c.ru/db/v8std#content:737:hdoc)
 
 ## Сниппеты
diff --git a/docs/diagnostics/MissingVariablesDescription.md b/docs/diagnostics/MissingVariablesDescription.md
index 6de1e307d85..e1e90090bbc 100644
--- a/docs/diagnostics/MissingVariablesDescription.md
+++ b/docs/diagnostics/MissingVariablesDescription.md
@@ -30,11 +30,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Источник: [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/diagnostics/NestedFunctionInParameters.md b/docs/diagnostics/NestedFunctionInParameters.md
index 6737c54b6e2..4350ed7f43e 100644
--- a/docs/diagnostics/NestedFunctionInParameters.md
+++ b/docs/diagnostics/NestedFunctionInParameters.md
@@ -35,11 +35,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Параметры процедур и функций](https://its.1c.ru/db/v8std#content:640:hdoc)
 
diff --git a/docs/diagnostics/NonStandardRegion.md b/docs/diagnostics/NonStandardRegion.md
index c3873fa1cf1..9b96a1905eb 100644
--- a/docs/diagnostics/NonStandardRegion.md
+++ b/docs/diagnostics/NonStandardRegion.md
@@ -16,11 +16,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Источник [Соглашения при написания кода. Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/diagnostics/OSUsersMethod.md b/docs/diagnostics/OSUsersMethod.md
index 89fec7bc668..c063dc41169 100644
--- a/docs/diagnostics/OSUsersMethod.md
+++ b/docs/diagnostics/OSUsersMethod.md
@@ -11,11 +11,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Полезная информация: [Атака Pass-the-hash](https://ru.wikipedia.org/wiki/%D0%90%D1%82%D0%B0%D0%BA%D0%B0_Pass-the-hash)
 
 ## Сниппеты
diff --git a/docs/diagnostics/UnsafeSafeModeMethodCall.md b/docs/diagnostics/UnsafeSafeModeMethodCall.md
index 35cd5e5fb68..5c19c290636 100644
--- a/docs/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/diagnostics/UnsafeSafeModeMethodCall.md
@@ -34,11 +34,7 @@
 ```
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Источник: [Тип значения, возвращаемый методом "БезопасныйРежим()](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
 
 ## Сниппеты
diff --git a/docs/diagnostics/UsingExternalCodeTools.md b/docs/diagnostics/UsingExternalCodeTools.md
index 4bf88fadac7..7eccba17520 100644
--- a/docs/diagnostics/UsingExternalCodeTools.md
+++ b/docs/diagnostics/UsingExternalCodeTools.md
@@ -25,11 +25,7 @@
 
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Ограничение на выполнение «внешнего» кода](https://its.1c.ru/db/v8std#content:669:hdoc)
 
diff --git a/docs/diagnostics/WrongUseOfRollbackTransactionMethod.md b/docs/diagnostics/WrongUseOfRollbackTransactionMethod.md
index 76f45f60c9a..7b5a065ddb3 100644
--- a/docs/diagnostics/WrongUseOfRollbackTransactionMethod.md
+++ b/docs/diagnostics/WrongUseOfRollbackTransactionMethod.md
@@ -31,11 +31,7 @@
 ```
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Источник: [Стандарт: Транзакции: правила использования](https://its.1c.ru/db/v8std#content:783:hdoc:_top)
 
 ## Сниппеты
diff --git a/docs/en/diagnostics/CachedPublic.md b/docs/en/diagnostics/CachedPublic.md
index 5462c2d49a6..8a5ebb7b365 100644
--- a/docs/en/diagnostics/CachedPublic.md
+++ b/docs/en/diagnostics/CachedPublic.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CodeBlockBeforeSub.md b/docs/en/diagnostics/CodeBlockBeforeSub.md
index 13a08fecd47..8d7e572230e 100644
--- a/docs/en/diagnostics/CodeBlockBeforeSub.md
+++ b/docs/en/diagnostics/CodeBlockBeforeSub.md
@@ -36,11 +36,7 @@ EndProcedure
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - [Module structure](https://its.1c.ru/db/v8std/content/455/hdoc)
 
diff --git a/docs/en/diagnostics/CodeOutOfRegion.md b/docs/en/diagnostics/CodeOutOfRegion.md
index 35cd9a6bab2..56328b465fb 100644
--- a/docs/en/diagnostics/CodeOutOfRegion.md
+++ b/docs/en/diagnostics/CodeOutOfRegion.md
@@ -20,11 +20,7 @@ The code of module should be structured and divided into regions.
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
index 3ee862696f3..a369b54a9b6 100644
--- a/docs/en/diagnostics/CommonModuleAssign.md
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleInvalidType.md b/docs/en/diagnostics/CommonModuleInvalidType.md
index 4660ca77fba..131f975132f 100644
--- a/docs/en/diagnostics/CommonModuleInvalidType.md
+++ b/docs/en/diagnostics/CommonModuleInvalidType.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
index f68b7fcef4c..50b09f36785 100644
--- a/docs/en/diagnostics/CommonModuleNameCached.md
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
index 384de32edbe..0dacb3136d2 100644
--- a/docs/en/diagnostics/CommonModuleNameClient.md
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
index f7bd46df19a..aee9002cde0 100644
--- a/docs/en/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
index 017824cc80c..c618cba4bbf 100644
--- a/docs/en/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
index fe99c8d9d10..4ebf0d85dd7 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index 6bbc7f913b8..0aab72877fc 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index 16edd513e53..6acca29eaa6 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
index 17c055b6d41..073ebddf612 100644
--- a/docs/en/diagnostics/CommonModuleNameWords.md
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -19,11 +19,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/CyclomaticComplexity.md b/docs/en/diagnostics/CyclomaticComplexity.md
index d27edb5d924..7284e57f48e 100644
--- a/docs/en/diagnostics/CyclomaticComplexity.md
+++ b/docs/en/diagnostics/CyclomaticComplexity.md
@@ -79,11 +79,7 @@ Cyclomatic complexity increases by 1 for each of following constructions:
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - [Cyclomatic Complexity PHP](https://pdepend.org/documentation/software-metrics/cyclomatic-complexity.html)
 - [Cyclomatic Complexity (RU)](https://ru.wikipedia.org/wiki/%D0%A6%D0%B8%D0%BA%D0%BB%D0%BE%D0%BC%D0%B0%D1%82%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F_%D1%81%D0%BB%D0%BE%D0%B6%D0%BD%D0%BE%D1%81%D1%82%D1%8C)
diff --git a/docs/en/diagnostics/DataExchangeLoading.md b/docs/en/diagnostics/DataExchangeLoading.md
index fd29eb2c18e..0bb7e628d79 100644
--- a/docs/en/diagnostics/DataExchangeLoading.md
+++ b/docs/en/diagnostics/DataExchangeLoading.md
@@ -46,11 +46,7 @@ EndProcedure
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * [Стандарт: Использование признака ОбменДанными.Загрузка в обработчиках событий объекта](https://its.1c.ru/db/v8std#content:773)
 * [Обработчик события ПриЗаписи](https://its.1c.ru/db/v8std#content:465)
diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index 6f31f95cf59..50e93e0f232 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/DeprecatedCurrentDate.md b/docs/en/diagnostics/DeprecatedCurrentDate.md
index 03c282d3862..fb0d4554780 100644
--- a/docs/en/diagnostics/DeprecatedCurrentDate.md
+++ b/docs/en/diagnostics/DeprecatedCurrentDate.md
@@ -27,11 +27,7 @@ OperationDate = CurrentSessionDate();
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Reference: [Metadata creation and change. Work in different timezones](https://its.1c.ru/db/v8std/content/643/hdoc)
 
diff --git a/docs/en/diagnostics/DeprecatedMethods8310.md b/docs/en/diagnostics/DeprecatedMethods8310.md
index 325a4e26edd..34cb0a1e2de 100644
--- a/docs/en/diagnostics/DeprecatedMethods8310.md
+++ b/docs/en/diagnostics/DeprecatedMethods8310.md
@@ -19,11 +19,7 @@ ClientApplicationInterfaceCurrentVariant().
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Version 8.3.10 changelog](https://dl03.1c.ru/content/Platform/8_3_10_2699/1cv8upd.htm)
 
 ## Snippets
diff --git a/docs/en/diagnostics/DeprecatedMethods8317.md b/docs/en/diagnostics/DeprecatedMethods8317.md
index ddc9556ada3..a10793f844b 100644
--- a/docs/en/diagnostics/DeprecatedMethods8317.md
+++ b/docs/en/diagnostics/DeprecatedMethods8317.md
@@ -17,11 +17,7 @@ The following global context methods are deprecated and should not be used:
 You should use the same methods of the ErrorProcessing object instead.
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Source: [Platform 8.3.17 changelog](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm)
 
 ## Snippets
diff --git a/docs/en/diagnostics/DeprecatedTypeManagedForm.md b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
index 6e7c7c5ba90..76ff26474c6 100644
--- a/docs/en/diagnostics/DeprecatedTypeManagedForm.md
+++ b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
@@ -15,11 +15,7 @@ Starting from the platform version 8.3.14, the "ManagedForm" type has been renam
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - Source: [Changelog](https://dl03.1c.ru/content/Platform/8_3_16_1148/1cv8upd_8_3_16_1148.htm)
 
diff --git a/docs/en/diagnostics/DuplicateRegion.md b/docs/en/diagnostics/DuplicateRegion.md
index 52cc5142d52..0d77ad4c46b 100644
--- a/docs/en/diagnostics/DuplicateRegion.md
+++ b/docs/en/diagnostics/DuplicateRegion.md
@@ -19,11 +19,7 @@ All code should be structured and divided into sections (regions), each section
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/en/diagnostics/EmptyRegion.md b/docs/en/diagnostics/EmptyRegion.md
index 1e9f3b0b19b..b606b9e9e5f 100644
--- a/docs/en/diagnostics/EmptyRegion.md
+++ b/docs/en/diagnostics/EmptyRegion.md
@@ -17,11 +17,7 @@ Module should not contain empty regions.
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Standard: Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Snippets
diff --git a/docs/en/diagnostics/ExcessiveAutoTestCheck.md b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
index 4b27bd3522b..3c840787b83 100644
--- a/docs/en/diagnostics/ExcessiveAutoTestCheck.md
+++ b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/ExecuteExternalCode.md b/docs/en/diagnostics/ExecuteExternalCode.md
index 678a7df908b..ee0491d746d 100644
--- a/docs/en/diagnostics/ExecuteExternalCode.md
+++ b/docs/en/diagnostics/ExecuteExternalCode.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
index e70751a4e9a..4441a568a55 100644
--- a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
+++ b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/FormDataToValue.md b/docs/en/diagnostics/FormDataToValue.md
index a034ef7baac..3dff3f1f089 100644
--- a/docs/en/diagnostics/FormDataToValue.md
+++ b/docs/en/diagnostics/FormDataToValue.md
@@ -19,11 +19,7 @@ EndProcedure
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Using of FormAttributeToValue method](https://its.1c.ru/db/v8std#content:409:hdoc)
 
 ## Snippets
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index b51a70af555..a86e707ed40 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -70,11 +70,7 @@ EndFunction
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/GetFormMethod.md b/docs/en/diagnostics/GetFormMethod.md
index 5fb91daa26f..c634d7b2450 100644
--- a/docs/en/diagnostics/GetFormMethod.md
+++ b/docs/en/diagnostics/GetFormMethod.md
@@ -24,11 +24,7 @@ EndProcedure
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Standard](https://its.1c.ru/db/v8std/content/404/hdoc)
 
 ## Snippets
diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index b246634904d..f75b6eeb646 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -35,11 +35,7 @@ If IsInRole("Paymaster") OR PrivilegedMode() Then ...
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Standard: Checking access rights](https://support.1ci.com/hc/en-us/articles/360011003180-Checking-access-rights)
 
 ## Snippets
diff --git a/docs/en/diagnostics/MissingVariablesDescription.md b/docs/en/diagnostics/MissingVariablesDescription.md
index 489a9e55df2..38063226d26 100644
--- a/docs/en/diagnostics/MissingVariablesDescription.md
+++ b/docs/en/diagnostics/MissingVariablesDescription.md
@@ -29,11 +29,7 @@ Var Context;
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 * Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/en/diagnostics/NestedFunctionInParameters.md b/docs/en/diagnostics/NestedFunctionInParameters.md
index ea2fe9a639a..5b3d027c055 100644
--- a/docs/en/diagnostics/NestedFunctionInParameters.md
+++ b/docs/en/diagnostics/NestedFunctionInParameters.md
@@ -40,11 +40,7 @@ Attachments.Insert(AttachedFile.Description, PictureData);
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - [Parameters of procedures and functions (RU)](https://its.1c.ru/db/v8std#content:640:hdoc)
 
diff --git a/docs/en/diagnostics/NonStandardRegion.md b/docs/en/diagnostics/NonStandardRegion.md
index 4ffdd670671..c3a74c4220e 100644
--- a/docs/en/diagnostics/NonStandardRegion.md
+++ b/docs/en/diagnostics/NonStandardRegion.md
@@ -20,11 +20,7 @@ All module code should be structured and divided into sections (regions).
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - Reference: [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
diff --git a/docs/en/diagnostics/OSUsersMethod.md b/docs/en/diagnostics/OSUsersMethod.md
index 913c23749f4..4301d3ca226 100644
--- a/docs/en/diagnostics/OSUsersMethod.md
+++ b/docs/en/diagnostics/OSUsersMethod.md
@@ -11,11 +11,7 @@ Using method may carry a malicious function.
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Pass-the-hash attack](https://en.wikipedia.org/wiki/Pass_the_hash)
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/TempFilesDir.md b/docs/en/diagnostics/TempFilesDir.md
index 3c374196e88..705f0bbe7d7 100644
--- a/docs/en/diagnostics/TempFilesDir.md
+++ b/docs/en/diagnostics/TempFilesDir.md
@@ -29,11 +29,7 @@ Data.Write(TemporaryFileName);
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 * Source: [Standard: Temporary Files and Directories](https://support.1ci.com/hc/en-us/articles/360011122319-Access-to-the-file-system-from-the-configuration-code)
 
 ## Snippets
diff --git a/docs/en/diagnostics/ThisObjectAssign.md b/docs/en/diagnostics/ThisObjectAssign.md
index fc8f4d6a83a..47de0f67877 100644
--- a/docs/en/diagnostics/ThisObjectAssign.md
+++ b/docs/en/diagnostics/ThisObjectAssign.md
@@ -13,11 +13,7 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
 
diff --git a/docs/en/diagnostics/TooManyReturns.md b/docs/en/diagnostics/TooManyReturns.md
index eab6b047d89..38dc0effd2c 100644
--- a/docs/en/diagnostics/TooManyReturns.md
+++ b/docs/en/diagnostics/TooManyReturns.md
@@ -45,11 +45,7 @@ EndFunction
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - [Why Many Return Statements Are a Bad Idea in OOP](https://www.yegor256.com/2015/08/18/multiple-return-statements-in-oop.html)
 - [JAVA: Methods should not have too many return statements](https://rules.sonarsource.com/java/RSPEC-1142)
diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
index 2251e862871..770a9adde88 100644
--- a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -32,11 +32,7 @@ EndIf;
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [SafeMode method](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
 
 ## Snippets
diff --git a/docs/en/diagnostics/UsingExternalCodeTools.md b/docs/en/diagnostics/UsingExternalCodeTools.md
index a4de0c00f33..f5e26a0544e 100644
--- a/docs/en/diagnostics/UsingExternalCodeTools.md
+++ b/docs/en/diagnostics/UsingExternalCodeTools.md
@@ -30,11 +30,7 @@ At the moment, the server context is not analyzed, so diagnostic works both at c
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 - [Restriction on the execution of "external" code](https://its.1c.ru/db/v8std#content:669:hdoc)
 
diff --git a/docs/en/diagnostics/WrongUseOfRollbackTransactionMethod.md b/docs/en/diagnostics/WrongUseOfRollbackTransactionMethod.md
index 7bb7beec7eb..3c5fe799b69 100644
--- a/docs/en/diagnostics/WrongUseOfRollbackTransactionMethod.md
+++ b/docs/en/diagnostics/WrongUseOfRollbackTransactionMethod.md
@@ -27,11 +27,7 @@ EndTry;
 ```
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 Source: [Transactions: rules of use:](https://support.1ci.com/hc/en-us/articles/360011121239-Transactions-rules-of-use)
 
 ## Snippets

From 6296817030350940c0b9562d98dda73115424a73 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 11:09:03 +0300
Subject: [PATCH 338/444] precommit

---
 docs/diagnostics/DeprecatedMethodCall.md      | 38 +++++++++++--------
 docs/diagnostics/index.md                     |  5 ++-
 docs/en/diagnostics/DeprecatedMethodCall.md   | 21 ++++------
 docs/en/diagnostics/index.md                  |  5 ++-
 .../DeprecatedMethodCallDiagnostic.java       |  5 +--
 .../configuration/parameters-schema.json      | 10 +++++
 .../languageserver/configuration/schema.json  |  3 ++
 7 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/docs/diagnostics/DeprecatedMethodCall.md b/docs/diagnostics/DeprecatedMethodCall.md
index 6fcb1ecdbe5..4cc1ba98358 100644
--- a/docs/diagnostics/DeprecatedMethodCall.md
+++ b/docs/diagnostics/DeprecatedMethodCall.md
@@ -1,36 +1,44 @@
-# <Diagnostic name> (<DiagnosticKey>)
+# Устаревшие методы не должны использоваться (DeprecatedMethodCall)
 
-<Metadata>
-
-## <Params>
+| Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Дефект кода` | `BSL`<br/>`OS` | `Незначительный` | `Да` | `3` | `deprecated`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Описание диагностики
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Следует избегать использования или расширения устаревших методов. Пометка метода как устаревшего - это предупреждение о том, что метод будет удален в будущих версиях и оставлен для временной обратной совместимости.
+
+Исключение: допустимо вызывать устаревшие методы из устаревших методов.
 
 ## Примеры
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+```bsl
+// Устарела. Следует использовать НеУстаревшаяПроцедура.
+Процедура УстаревшаяПроцедура()
+КонецПроцедуры
+
+УстаревшаяПроцедура(); // Срабатывание диагностики
+```
+
 ## Источники
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
 
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+* Источник: [Стандарт: Описание процедур и функций](https://its.1c.ru/db/v8std/content/453/hdoc), раздел 5.7
+* [CWE-477 Use of Obsolete Function](http://cwe.mitre.org/data/definitions/477.html)
 
 ## Сниппеты
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Экранирование кода
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:DeprecatedMethodCall-off
+// BSLLS:DeprecatedMethodCall-on
 ```
 
 ### Параметр конфигурационного файла
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
-```
\ No newline at end of file
+"DeprecatedMethodCall": false
+```
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 5e73c492b46..09c6b1a555e 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -8,9 +8,9 @@
 
 ## Список реализованных диагностик
 
-Общее количество: **110**
+Общее количество: **111**
 
-* Дефект кода: **69**
+* Дефект кода: **70**
 * Уязвимость: **3**
 * Ошибка: **34**
 * Потенциальная уязвимость: **4**
@@ -46,6 +46,7 @@
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Использование устаревшего метода "ТекущаяДата" | Да | Важный | Ошибка | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Использование устаревшего метода "Найти" | Да | Незначительный | Дефект кода | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Ограничение на использование устаревшего метода "Сообщить" | Да | Незначительный | Дефект кода | `standard`<br/>`deprecated` |
+| [DeprecatedMethodCall](DeprecatedMethodCall.md) | Устаревшие методы не должны использоваться | Да | Незначительный | Дефект кода | `deprecated`<br/>`design` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Использование устаревшего метода клиентского приложения | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedMethods8317](DeprecatedMethods8317.md) | Использование устаревших глобальных методов платформы 8.3.17 | Да | Информационный | Дефект кода | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Устаревшее использование типа "УправляемаяФорма" | Да | Информационный | Дефект кода | `standard`<br/>`deprecated` |
diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
index 4e7e0f78ada..5571f710350 100644
--- a/docs/en/diagnostics/DeprecatedMethodCall.md
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -1,8 +1,8 @@
-# <Diagnostic name>
+# Deprecated methods should not be used (DeprecatedMethodCall)
 
-<Metadata>
-
-## <Params>
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
 ## Description
@@ -13,24 +13,19 @@
 
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
-
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
 
 ## Snippets
-<!-- Блоки ниже заполняются автоматически, не трогать -->
 
+<!-- Блоки ниже заполняются автоматически, не трогать -->
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:<DiagnosticKey>-off
-// BSLLS:<DiagnosticKey>-on
+// BSLLS:DeprecatedMethodCall-off
+// BSLLS:DeprecatedMethodCall-on
 ```
 
 ### Parameter for config
 
 ```json
-"<DiagnosticKey>": <DiagnosticConfig>
+"DeprecatedMethodCall": false
 ```
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 9873463279a..627d965dc73 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -8,10 +8,10 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 ## Implemented diagnostics
 
-Total: **110**
+Total: **111**
 
 * Error: **34**
-* Code smell: **69**
+* Code smell: **70**
 * Vulnerability: **3**
 * Security Hotspot: **4**
 
@@ -46,6 +46,7 @@ Total: **110**
 | [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
 | [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
 | [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [DeprecatedMethodCall](DeprecatedMethodCall.md) | Deprecated methods should not be used | Yes | Minor | Code smell | `deprecated`<br/>`design` |
 | [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated` |
 | [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index 33363526649..f8b58843d99 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -43,13 +43,12 @@
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
-  severity = DiagnosticSeverity.MAJOR,
-  minutesToFix = 1,
+  severity = DiagnosticSeverity.MINOR,
+  minutesToFix = 3,
   tags = {
     DiagnosticTag.DEPRECATED,
     DiagnosticTag.DESIGN
   }
-
 )
 public class DeprecatedMethodCallDiagnostic extends AbstractVisitorDiagnostic {
   public DeprecatedMethodCallDiagnostic(DiagnosticInfo info) {
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 b8bc8634d20..e73a1d1552b 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
@@ -354,6 +354,16 @@
             "title": "Restriction on the use of deprecated \"Message\" method",
             "$id": "#/definitions/DeprecatedMessage"
         },
+        "DeprecatedMethodCall": {
+            "description": "Deprecated methods should not be used",
+            "default": true,
+            "type": [
+                "boolean",
+                "object"
+            ],
+            "title": "Deprecated methods should not be used",
+            "$id": "#/definitions/DeprecatedMethodCall"
+        },
         "DeprecatedMethods8310": {
             "description": "Deprecated client application 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 ae234928712..af050b93a31 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
@@ -110,6 +110,9 @@
                 "DeprecatedMessage": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedMessage"
                 },
+                "DeprecatedMethodCall": {
+                    "$ref": "parameters-schema.json#/definitions/DeprecatedMethodCall"
+                },
                 "DeprecatedMethods8310": {
                     "$ref": "parameters-schema.json#/definitions/DeprecatedMethods8310"
                 },

From 564c4b16363b4dbefa734f14cbc7449fe244551e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 11:43:28 +0300
Subject: [PATCH 339/444] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88=D0=B8=D1=85=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeprecatedMethodCallDiagnostic.java       | 25 ++++++++++++++++++-
 .../DeprecatedMethodCallDiagnosticTest.java   |  6 ++++-
 .../DeprecatedMethodCallDiagnostic.bsl        |  2 ++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index f8b58843d99..bf20a3a37d2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -36,10 +36,12 @@
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -51,6 +53,9 @@
   }
 )
 public class DeprecatedMethodCallDiagnostic extends AbstractVisitorDiagnostic {
+  private static final Set<ModuleType> DEFAULT_MODULE_TYPES =
+    EnumSet.of(ModuleType.ManagerModule, ModuleType.CommonModule);
+
   public DeprecatedMethodCallDiagnostic(DiagnosticInfo info) {
     super(info);
   }
@@ -89,6 +94,24 @@ public ParseTree visitComplexIdentifier(BSLParser.ComplexIdentifierContext ctx)
     return super.visitComplexIdentifier(ctx);
   }
 
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+    if (currentMethodIsDeprecated(ctx, documentContext)) {
+      return super.visitGlobalMethodCall(ctx);
+    }
+
+    var methodName = ctx.methodName().getStart();
+    var methodNameText = methodName.getText();
+
+    documentContext.getSymbolTree().getMethods().stream()
+      .filter(methodSymbol -> methodSymbol.isDeprecated()
+        && methodSymbol.getName().equalsIgnoreCase(methodNameText))
+      .findAny()
+      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
+
+    return super.visitGlobalMethodCall(ctx);
+  }
+
   private static boolean currentMethodIsDeprecated(BSLParserRuleContext ctx, DocumentContext documentContext) {
     return Optional.ofNullable(Trees.getRootParent(ctx, BSLParser.RULE_sub))
       .flatMap(sub -> documentContext.getSymbolTree().getMethodSymbol(sub))
@@ -101,7 +124,7 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
     String methodNameText = methodName.getText();
 
     documentContexts.entrySet().stream()
-      .filter(entry -> entry.getKey() == ModuleType.ManagerModule || entry.getKey() == ModuleType.CommonModule)
+      .filter(entry -> DEFAULT_MODULE_TYPES.contains(entry.getKey()))
       .map(Map.Entry::getValue)
       .map(DocumentContext::getSymbolTree)
       .flatMap(symbolTree -> symbolTree.getMethods().stream())
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
index f5c91c4c42d..5c2515f6523 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnosticTest.java
@@ -37,11 +37,14 @@ class DeprecatedMethodCallDiagnosticTest extends AbstractDiagnosticTest<Deprecat
   @Test
   void test() {
 
+    // given
     initServerContext(PATH_TO_METADATA);
 
+    // when
     List<Diagnostic> diagnostics = getDiagnostics();
 
-    assertThat(diagnostics).hasSize(7);
+    // then
+    assertThat(diagnostics).hasSize(8);
     assertThat(diagnostics, true)
       .hasRange(1, 18, 1, 37)
       .hasRange(4, 18, 4, 35)
@@ -50,6 +53,7 @@ void test() {
       .hasRange(16, 34, 16, 53)
       .hasRange(19, 38, 19, 55)
       .hasRange(22, 39, 22, 56)
+      .hasRange(28, 0, 28, 19)
     ;
 
   }
diff --git a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
index 7447044902c..730314c8125 100644
--- a/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
+++ b/src/test/resources/diagnostics/DeprecatedMethodCallDiagnostic.bsl
@@ -26,6 +26,8 @@
 Если РегистрыСведений.РегистрСведений1.НеУстаревшаяФункция() Тогда
 КонецЕсли;
 
+УстаревшаяПроцедура(); // <--
+
 // Устарела.
 Процедура УстаревшаяПроцедура()
     ПервыйОбщийМодуль.УстаревшаяПроцедура(); // нет срабатывания, т.к. вызов из устаревшей процедуры

From 05387d394f6bc9b7c6433b8ca3229d3c48e15331 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 13:08:50 +0300
Subject: [PATCH 340/444] =?UTF-8?q?=D0=98=D0=BC=D1=8F=20=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B2=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/DeprecatedMethodCallDiagnostic.java           | 4 ++--
 .../diagnostics/DeprecatedMethodCallDiagnostic_en.properties  | 2 +-
 .../diagnostics/DeprecatedMethodCallDiagnostic_ru.properties  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index bf20a3a37d2..7d02236e262 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -107,7 +107,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       .filter(methodSymbol -> methodSymbol.isDeprecated()
         && methodSymbol.getName().equalsIgnoreCase(methodNameText))
       .findAny()
-      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
+      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName, info.getMessage(methodNameText)));
 
     return super.visitGlobalMethodCall(ctx);
   }
@@ -131,7 +131,7 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
       .filter(methodSymbol -> methodSymbol.isDeprecated()
         && methodSymbol.getName().equalsIgnoreCase(methodNameText))
       .findAny()
-      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName));
+      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName, info.getMessage(methodNameText)));
   }
 
   private static Optional<Token> getMethodName(BSLParser.CallStatementContext ctx) {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
index bae879b1aa4..62a48ed826b 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Remove deprecated method call
+diagnosticMessage=Remove deprecated method "%s" call
 diagnosticName=Deprecated methods should not be used
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
index 2c67956a6ea..e832d3bbd59 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Удалите вызов устаревшего метода
+diagnosticMessage=Удалите вызов устаревшего метода "%s"
 diagnosticName=Устаревшие методы не должны использоваться

From 8c600607600da0ad9058096c8676f010b4d7ea2d Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 13:25:13 +0300
Subject: [PATCH 341/444] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D1=81=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en/diagnostics/OSUsersMethod.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docs/en/diagnostics/OSUsersMethod.md b/docs/en/diagnostics/OSUsersMethod.md
index 4301d3ca226..8c6799363d1 100644
--- a/docs/en/diagnostics/OSUsersMethod.md
+++ b/docs/en/diagnostics/OSUsersMethod.md
@@ -14,20 +14,6 @@ Using method may carry a malicious function.
 
 Source: [Pass-the-hash attack](https://en.wikipedia.org/wiki/Pass_the_hash)
 
-<!-- Блоки ниже заполняются автоматически, не трогать -->
-### Diagnostic ignorance in code
-
-```bsl
-// BSLLS:OSUsersMethod-off
-// BSLLS:OSUsersMethod-on
-```
-
-### Parameter for config
-
-```json
-"OSUsersMethod": false
-```
-
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->

From 87d37285c2c9543749a1c9158378a3d4e036c919 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 13:54:23 +0300
Subject: [PATCH 342/444] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B5-=D0=B7=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/symbol/MethodDescription.java     | 19 ++++++++++---------
 .../DeprecatedMethodCallDiagnostic.java       | 15 +++++++++++++--
 ...precatedMethodCallDiagnostic_en.properties |  2 +-
 ...precatedMethodCallDiagnostic_ru.properties |  2 +-
 .../computer/MethodSymbolComputerTest.java    |  4 ++--
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
index 762c3805c70..bbe9699b07c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/MethodDescription.java
@@ -33,7 +33,8 @@
 public class MethodDescription {
 
   private static final int COMMENT_LENGTH = 2;
-  private static final Pattern DEPRECATED = CaseInsensitivePattern.compile("(?:\\s*)((?:Устарела|Deprecated)\\..*)");
+  private static final Pattern DEPRECATED_PATTERN
+    = CaseInsensitivePattern.compile("(?:\\s*)(?:Устарела|Deprecated)\\.(.*)");
 
   private final int startLine;
   private final int endLine;
@@ -41,18 +42,22 @@ public class MethodDescription {
   private final String description;
 
   @Getter
-  private final String deprecatedInfo;
+  private final String deprecationInfo;
+  @Getter
+  private final boolean deprecated;
 
   public MethodDescription(List<Token> comments) {
     description = comments.stream()
       .map(Token::getText)
       .map(MethodDescription::uncomment)
       .collect(Collectors.joining("\n"));
-    Matcher matcher = DEPRECATED.matcher(description);
+    Matcher matcher = DEPRECATED_PATTERN.matcher(description);
     if (matcher.find()) {
-      deprecatedInfo = matcher.group(1);
+      deprecationInfo = matcher.group(1);
+      deprecated = true;
     } else {
-      deprecatedInfo = "";
+      deprecationInfo = "";
+      deprecated = false;
     }
 
     if (comments.isEmpty()) {
@@ -69,10 +74,6 @@ public boolean isEmpty() {
     return description.isEmpty();
   }
 
-  public boolean isDeprecated() {
-    return !deprecatedInfo.isEmpty();
-  }
-
   public boolean contains(Token first, Token last) {
     int firstLine = first.getLine();
     int lastLine = last.getLine();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
index 7d02236e262..91f3969247e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java
@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
@@ -107,7 +108,7 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       .filter(methodSymbol -> methodSymbol.isDeprecated()
         && methodSymbol.getName().equalsIgnoreCase(methodNameText))
       .findAny()
-      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName, info.getMessage(methodNameText)));
+      .ifPresent(methodSymbol -> fireIssue(methodSymbol, methodName));
 
     return super.visitGlobalMethodCall(ctx);
   }
@@ -131,7 +132,17 @@ private void checkDeprecatedCall(String mdoRef, Token methodName) {
       .filter(methodSymbol -> methodSymbol.isDeprecated()
         && methodSymbol.getName().equalsIgnoreCase(methodNameText))
       .findAny()
-      .ifPresent(methodSymbol -> diagnosticStorage.addDiagnostic(methodName, info.getMessage(methodNameText)));
+      .ifPresent(methodSymbol -> fireIssue(methodSymbol, methodName));
+  }
+
+  private void fireIssue(MethodSymbol methodSymbol, Token methodName) {
+    var methodNameText = methodName.getText();
+
+    var deprecationInfo = methodSymbol.getDescription()
+      .map(MethodDescription::getDeprecationInfo)
+      .orElse("");
+
+    diagnosticStorage.addDiagnostic(methodName, info.getMessage(methodNameText, deprecationInfo));
   }
 
   private static Optional<Token> getMethodName(BSLParser.CallStatementContext ctx) {
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
index 62a48ed826b..73981ea5047 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_en.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Remove deprecated method "%s" call
+diagnosticMessage=Remove deprecated method "%s" call.%s
 diagnosticName=Deprecated methods should not be used
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
index e832d3bbd59..d7ac68435b6 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic_ru.properties
@@ -1,2 +1,2 @@
-diagnosticMessage=Удалите вызов устаревшего метода "%s"
+diagnosticMessage=Удалите вызов устаревшего метода "%s".%s
 diagnosticName=Устаревшие методы не должны использоваться
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
index db2a620cf92..b5d3b9cb200 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputerTest.java
@@ -102,12 +102,12 @@ void testDeprecated() {
     methodSymbol = methods.get(3);
 
     assertThat(methodSymbol.isDeprecated()).isTrue();
-    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecatedInfo()).isNotEmpty();
+    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecationInfo()).isEmpty();
 
     methodSymbol = methods.get(4);
 
     assertThat(methodSymbol.isDeprecated()).isTrue();
-    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecatedInfo()).isNotEmpty();
+    assertThat(methodSymbol.getDescription().orElseThrow().getDeprecationInfo()).isNotEmpty();
   }
 
   @Test

From ca7b4d42375760e37e06520220df22b58cd5923b Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Thu, 21 May 2020 18:42:45 +0700
Subject: [PATCH 343/444] up mdclasses + rename methods / variables

---
 build.gradle.kts                                              | 2 +-
 .../bsl/languageserver/context/DocumentContext.java           | 2 +-
 .../_1c_syntax/bsl/languageserver/context/ServerContext.java  | 4 ++--
 .../diagnostics/CachedPublicDiagnosticTest.java               | 2 +-
 .../diagnostics/CommonModuleInvalidTypeDiagnosticTest.java    | 2 +-
 .../diagnostics/CommonModuleNameCachedDiagnosticTest.java     | 2 +-
 .../diagnostics/CommonModuleNameClientDiagnosticTest.java     | 2 +-
 .../CommonModuleNameClientServerDiagnosticTest.java           | 2 +-
 .../diagnostics/CommonModuleNameFullAccessDiagnosticTest.java | 2 +-
 .../CommonModuleNameGlobalClientDiagnosticTest.java           | 2 +-
 .../diagnostics/CommonModuleNameGlobalDiagnosticTest.java     | 2 +-
 .../diagnostics/CommonModuleNameServerCallDiagnosticTest.java | 2 +-
 .../diagnostics/CommonModuleNameWordsDiagnosticTest.java      | 2 +-
 .../ExecuteExternalCodeInCommonModuleDiagnosticTest.java      | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d9860190cf2..2d204cb6b44 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "4034e83681b")
-    implementation("com.github.1c-syntax", "mdclasses", "86be1579c4")
+    implementation("com.github.1c-syntax", "mdclasses", "a638193b9cc52ce9ba8d6f1bea02f3e810824414")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
index 922a1317730..58930c4cec8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java
@@ -190,7 +190,7 @@ public Map<SupportConfiguration, SupportVariant> getSupportVariants() {
   }
 
   public Optional<MDObjectBase> getMdObject() {
-    return Optional.ofNullable(getServerContext().getConfiguration().getModulesByURI().get(getUri()));
+    return Optional.ofNullable(getServerContext().getConfiguration().getModulesByObject().get(getUri()));
   }
 
   public void rebuild(String content) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
index f77949f8049..e86350c4e2b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -171,8 +171,8 @@ private Configuration computeConfigurationMetadata() {
   }
 
   private void addMdoRefByUri(URI uri, DocumentContext documentContext) {
-    var modulesByUri = getConfiguration().getModulesByURI();
-    var mdoByUri = modulesByUri.get(uri);
+    var modulesByObject = getConfiguration().getModulesByObject();
+    var mdoByUri = modulesByObject.get(uri);
 
     if (mdoByUri != null) {
       var mdoRef = mdoByUri.getMdoRef();
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
index d6864b85c3f..e5500a67824 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnosticTest.java
@@ -132,7 +132,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(moduleFile.toUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(moduleFile.toUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
index 917bf8f286e..18e89e8d910 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleInvalidTypeDiagnosticTest.java
@@ -176,7 +176,7 @@ void getDocumentContextFromFile() {
       serverContext
     ));
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
index 1e5ccc8cf06..bc425578217 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameCachedDiagnosticTest.java
@@ -139,7 +139,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
index 10830940b8a..876afb788ca 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientDiagnosticTest.java
@@ -177,7 +177,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
index f1223265d43..5b559d6a7c4 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameClientServerDiagnosticTest.java
@@ -176,7 +176,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
index 3813afac3e9..2c7b1154835 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameFullAccessDiagnosticTest.java
@@ -127,7 +127,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
index 45bff436bd7..6cb45698694 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalClientDiagnosticTest.java
@@ -217,7 +217,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
index 371ac661396..f58b55ce8b6 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameGlobalDiagnosticTest.java
@@ -126,7 +126,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
index 6f78d4ff091..ce255d3a322 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameServerCallDiagnosticTest.java
@@ -157,7 +157,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
index 1abd72f1ef3..93ef69ee195 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommonModuleNameWordsDiagnosticTest.java
@@ -129,7 +129,7 @@ void getDocumentContextFromFile() {
     ));
 
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
index 10d2aa5e6d7..3d82bb7cb2a 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExecuteExternalCodeInCommonModuleDiagnosticTest.java
@@ -127,7 +127,7 @@ private void getDocumentContextFromFile() {
       serverContext
     ));
 
-    module = spy((CommonModule) configuration.getModulesByURI().get(documentContext.getUri()));
+    module = spy((CommonModule) configuration.getModulesByObject().get(documentContext.getUri()));
 
   }
 }

From a315845b98c1f067d04699db7c165f3786bdddc7 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 21 May 2020 17:15:15 +0300
Subject: [PATCH 344/444] Update docs/contributing/StyleGuide.md

---
 docs/contributing/StyleGuide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/StyleGuide.md b/docs/contributing/StyleGuide.md
index 2125d8e7048..c8a40db76ff 100644
--- a/docs/contributing/StyleGuide.md
+++ b/docs/contributing/StyleGuide.md
@@ -6,7 +6,7 @@
 
 ## Общие рекомендации
 
-Если метод на законных основаниях может возвращать null, следует возвращать Optional\<T>, вместо явного возврата null.
+Если метод на законных основаниях может возвращать `null`, следует возвращать `Optional<T>`, вместо явного возврата `null`.
 
 ## Форматирование
 

From a0fda1f78571c93c159f3ed74e8ad0cf2c1e34cc Mon Sep 17 00:00:00 2001
From: Tymko Oleg <olegtymko@yandex.ru>
Date: Thu, 21 May 2020 23:31:39 +0700
Subject: [PATCH 345/444] =?UTF-8?q?=D0=B1=D0=B0=D0=BC=D0=BF=20=D0=B4=D0=BE?=
 =?UTF-8?q?=200.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fb3c627bbf1..9224a639060 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     }
 
     implementation("com.github.1c-syntax", "utils", "4034e83681b")
-    implementation("com.github.1c-syntax", "mdclasses", "a638193b9cc52ce9ba8d6f1bea02f3e810824414")
+    implementation("com.github.1c-syntax", "mdclasses", "0.5.0")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)
 

From 050ef2113bb59f15245e14bb741da38c8ee0c6f3 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 11:50:44 +0300
Subject: [PATCH 346/444] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9224a639060..12fd46df676 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "57e4b9574b") {
+    implementation("com.github.1c-syntax", "bsl-parser", "4de6f367cd279c012a2a0b024ff01e7a542257e0") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")

From ab66b2522c041892ece1ac0711a158d41af10dbb Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 11:56:40 +0300
Subject: [PATCH 347/444] Update faq.md

---
 docs/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 4e5de94d9a7..bc1a31de1eb 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -10,7 +10,7 @@
 
 Все диагностики имеет страницу с описанием в разделе `Диагностики`, например интересующая [Ограничение на длину строки](diagnostics/LineLength.md). Если диагностика может менять свое поведение, то на странице с описанием будут присутствовать параметры с описанием, на что они влияют. В данном случае - параметр `maxLineLength` как раз и отвечает за максимальную длину строки.
 
-## Как отключить Lens о когнитивной диагностики?
+## Как отключить Lens о когнитивной сложности?
 
 Для отключения `линзы` с информацией о когнитивной сложности стоит воспользоваться конфигурационным файлом, в котором для параметра `showCognitiveComplexity` установить значение `false`. О возможностях конфигурирования можно узнать в [описании конфигурационного файла](features/ConfigurationFile.md)
 

From d6ba1a04fff087611df3d9b27bd8293d4af3b448 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:25 +0000
Subject: [PATCH 348/444] Translate faq.md via GitLocalize

---
 docs/en/faq.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/en/faq.md b/docs/en/faq.md
index 554f7bdbbc7..654851cb2ca 100644
--- a/docs/en/faq.md
+++ b/docs/en/faq.md
@@ -1 +1,37 @@
 # Frequently asked questions
+
+This section contains the most frequently asked questions and answers.
+
+## How to change the language of diagnostic messages?
+
+To change the language of displayed messages from Russian (default) to English, you can use the configuration file. The configuration options can be found in the [description of configuration file.](features/ConfigurationFile.md)
+
+## How to increase the maximum line length in diagnostics? `Line length limit` ?
+
+All diagnostics has a page with a description in the `Diagnostics` section, for example, [Line length limit](diagnostics/LineLength.md). If the diagnosis can change its behavior, then on the description page there will be parameters with a description of what they affect. In this case, the `maxLineLength` parameter is responsible for the maximum line length.
+
+## How to disable Lens on cognitive complexity?
+
+To disable the `lense` with information about cognitive complexity, you should use the configuration file in which `showCognitiveComplexity` set to `false` . The configuration options can be found in the [description of the configuration file.](features/ConfigurationFile.md)
+
+## I think that the diagnosis does not work correctly. What to do?
+
+In case of doubt (or confidence) that the diagnosis is not working correctly, there are two ways
+
+- contact the [telegram](https://t.me/bsl_language_server) chat and describe situation, maybe still there is no error
+- create issue ( [issue](https://github.com/1c-syntax/bsl-language-server/issues) ) in the project repository of the appropriate type, where to attach the error description and, it is very desirable, code examples where the diagnosis does not work correctly.
+
+## `BSL Language Server` and SonarQube plugin are the same things?
+
+`BSL Language Server` is a stand-alone application, the implementation of the server side of the LSP protocol. The plugin for SonarQube uses the `BSL Language Server` to analyze the BSL source code (1C configurations, 1Scipt and OSWeb scripts).
+
+`BSL Language Server` can be used with any application that has an LSP client implementation. Verified connections:
+
+- plugin for [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/) ;
+- additional utility for 1C:Enterprise in DESIGNER mode [Phoenix BSL](https://github.com/otymko/phoenixbsl) ;
+- plugin for [Sublime Text](https://github.com/sublimelsp/LSP) .
+
+Also through direct import `BSL Language Server` work:
+
+- plugin for [1C: Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (own implementation, without LSP);
+- plugin for [SonarQube](https://github.com/1c-syntax/sonar-bsl-plugin-community) ;

From c0013ad6c0fc23b8fc18f9105a14007d271355b8 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:26 +0000
Subject: [PATCH 349/444] Translate systemRequirements.md via GitLocalize

---
 docs/en/systemRequirements.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/en/systemRequirements.md b/docs/en/systemRequirements.md
index 0658719e7d7..4de75b17eed 100644
--- a/docs/en/systemRequirements.md
+++ b/docs/en/systemRequirements.md
@@ -1 +1,19 @@
 # System requirements
+
+Using ` BSL Language Server ` has some limitations, listed bellow
+
+## Поддерживаемые версии Java
+
+`BSL Language Server` is a console Java application and requires the presence of a Java virtual machine on the computer.
+
+The minimum supported version is Java 11, but as part of the build pipelines, a health check is performed when using more recent versions. Java versions 11, 13 and 14 are currently supported.
+
+JDK vendor is also interesting. Due to the changed licensing policy of Oracle, it is recommended to use open implementations of the `OpenJDK` virtual machine: AdoptOpenJDK, Liberica JDK.
+
+## Поддерживаемые операционные системы
+
+`BSL Language Server` should work on all systems running modern desktop and server operating systems which supported Java. The most popular environments are tested as part of the build pipelines:
+
+- гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
+- поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.
+- поддерживается MacOS последних версий

From db8eec6f2df51b22a78349bd80ab4a89371990cf Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:27 +0000
Subject: [PATCH 350/444] Translate systemRequirements.md via GitLocalize

---
 docs/en/systemRequirements.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/systemRequirements.md b/docs/en/systemRequirements.md
index 4de75b17eed..d3b4801571f 100644
--- a/docs/en/systemRequirements.md
+++ b/docs/en/systemRequirements.md
@@ -2,7 +2,7 @@
 
 Using ` BSL Language Server ` has some limitations, listed bellow
 
-## Поддерживаемые версии Java
+## Supported Java Versions
 
 `BSL Language Server` is a console Java application and requires the presence of a Java virtual machine on the computer.
 
@@ -10,10 +10,10 @@ The minimum supported version is Java 11, but as part of the build pipelines, a
 
 JDK vendor is also interesting. Due to the changed licensing policy of Oracle, it is recommended to use open implementations of the `OpenJDK` virtual machine: AdoptOpenJDK, Liberica JDK.
 
-## Поддерживаемые операционные системы
+## Supported OS
 
 `BSL Language Server` should work on all systems running modern desktop and server operating systems which supported Java. The most popular environments are tested as part of the build pipelines:
 
-- гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
-- поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.
-- поддерживается MacOS последних версий
+- guaranteed to work on the latest versions of the Windows 7/10, Windows server 2012 and higher
+- latest Linux OS supported
+- latest macos supported

From eed9e32ba41cca9b013dabb375417d1773be440b Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:29 +0000
Subject: [PATCH 351/444] Translate DeprecatedMethodCall.md via GitLocalize

---
 docs/en/diagnostics/DeprecatedMethodCall.md | 26 +++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
index 5571f710350..02c6b1c895b 100644
--- a/docs/en/diagnostics/DeprecatedMethodCall.md
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -1,27 +1,39 @@
 # Deprecated methods should not be used (DeprecatedMethodCall)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br/>`design` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br>`design`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Use or extension of deprecated methods should be avoided. Marking method as deprecated is a warning that means the method will be removed in future versions and left for temporary backward compatibility.
+
+Exception: It is possible to call deprecated methods from deprecated methods.
 
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+```bsl
+// BSLLS:DeprecatedMethodCall-off
+// BSLLS:DeprecatedMethodCall-on
+```
+
 ## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+
+- [Standart: Procedures and functions description](https://its.1c.ru/db/v8std/content/453/hdoc), section 5.7
+- [CWE-477 Use of Obsolete Function](http://cwe.mitre.org/data/definitions/477.html)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedMethodCall-off
-// BSLLS:DeprecatedMethodCall-on
+"DeprecatedMethodCall": false
 ```
 
 ### Parameter for config

From 1f6220399f5315ad7d8535c4300acc5ba1312d76 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:30 +0000
Subject: [PATCH 352/444] Translate _config.yml via GitLocalize

---
 docs/en/_config.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 docs/en/_config.yml

diff --git a/docs/en/_config.yml b/docs/en/_config.yml
new file mode 100644
index 00000000000..32884f58603
--- /dev/null
+++ b/docs/en/_config.yml
@@ -0,0 +1,3 @@
+---
+include:
+- "/javadoc/com/github/_1c_syntax"

From 67cfb332613420f198668f73850700019e72fd6e Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:32 +0000
Subject: [PATCH 353/444] Translate ConfigurationFile.md via GitLocalize

---
 docs/en/features/ConfigurationFile.md | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/docs/en/features/ConfigurationFile.md b/docs/en/features/ConfigurationFile.md
index f3bdcdc3ffc..b9bbf17e686 100644
--- a/docs/en/features/ConfigurationFile.md
+++ b/docs/en/features/ConfigurationFile.md
@@ -1,19 +1,25 @@
 # BSL Language Server Configuration
 
-BSL Language Server provides the ability to change the settings using a configuration file in json format.
- The created file must be specified using the key `--configuration ` *(or `-c`)*  when running BSL Language Server as a console application. If you use the editor / IDE with the BSL Language Server client plugin, place it in accordance with the documentation *(this is usually the root of a project or workspace)*.
+BSL Language Server provides the ability to change the settings using a configuration file in json format. The created file must be specified using the key `--configuration ` *(or `-c`)*  when running BSL Language Server as a console application. If you use the editor / IDE with the BSL Language Server client plugin, place it in accordance with the documentation *(this is usually the root of a project or workspace)*.
 
 ## Settings
 
 Name | Type | Description
 :-- | :-: | :--
-`diagnosticLanguage` | `String` | Set the language for displaying diagnosed comments. Supported languages:<br>* `ru` - for Russian (*default*)<br>* `en` - for English
-`showCognitiveComplexityCodeLens` | `Boolean` | In code editors/IDE with support codelens*(for example [Visual Studio Code](https://code.visualstudio.com/))*, enables displaying the value[ of the cognitive complexity](../diagnostics/CognitiveComplexity.md) of the method over its definition. By default is enabled (*is set to `true`*)
-`showCyclomaticComplexityCodeLens` | `Boolean` | Similar to `showCognitiveComplexityCodeLens`, enables the display of the [cyclomatic complexity](../diagnostics/CyclomaticComplexity.md) value   of the method. By default enabled (*is set to `true`*)
-`computeDiagnosticsTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<br>* `onSave` - when saving a file (*default*)<br>* `never` - analysis will not be performed
-`computeDiagnosticsSkipSupport` | `String` | This parameter sets **1C configuration** file skipping mode *(for example files are not analyzed for issues)* which are "on support" from vendor configuration. Possible values:<br>* `withSupport` - skip all modules set "on support" *(all "locks" types)*<br>* `withSupportLocked` -  skip modules set "on support" with prohibited modification *("yellow  closed lock")*<br>* `never` - skip no modules as support mode is not analyzed *(set by default)*
-`traceLog` | `String` | To log all requests *(incoming and outgoing)* between **BSL Language Server** and **Language Client**  from used editor/IDE. this parameter sets log file path. The path can set either absolute or relative *(from project root)*, by default the value is not set.<br><br>**WARNING**<br><br>* When starting **BSL Language Server** overwrites this file <br>* Speed of interaction between client and server **DRAMATICALLY REDUCED**
-`diagnostics` | `JSON-Object` | Parameter is a collection of diagnostics parameters.  Collection items are json-objects with the following structure:<br>* *object key* - string, is diagnostic key<br>* *object value* - if is boolean, then interpreted as diagnostic off-switch (`false`) or on-switch with default parameters (`true`), if is type  `json-object`,  collection of diagnostic parameters.<br><br>Key, if set to ON by default and all allowed parameters and examples are given on the diagnostic page.
+`language` | `String` | Set the language for displaying diagnosed comments. Supported languages:<br>* `ru` - for Russian (*default*)<br>* `en` - for English
+`codeLens` | `JSON-Object` | Contains the settings for displaying `lens` in advanced code editors / IDEs *(for example, [Visual Studio Code](https://code.visualstudio.com/) )* , which displays various information above a block of code.
+⤷   `showCognitiveComplexity` | `Boolean` | In code editors/IDE with support codelens*(for example [Visual Studio Code](https://code.visualstudio.com/))*, enables displaying the value[ of the cognitive complexity](../diagnostics/CognitiveComplexity.md) of the method over its definition. By default is enabled (*is set to `true`*)
+⤷   `showCyclomaticComplexity` | `Boolean` | Similar to `showCognitiveComplexityCodeLens`, enables the display of the [cyclomatic complexity](../diagnostics/CyclomaticComplexity.md) value   of the method. By default enabled (*is set to `true`*)
+`diagnostics` | `JSON-Объект` | Contains diagnostic settings
+⤷   `computeTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<em data-md-type="emphasis"><br> <code data-md-type="codespan">onSave</code> - when saving a file (<em data-md-type="emphasis">default</em>)</em><br> `never` - analysis will not be performed
+⤷   `skipSupport` | `String` | This parameter sets **1C configuration** file skipping mode *(for example files are not analyzed for issues)* which are "on support" from vendor configuration. Possible values:<br>* `withSupport` - skip all modules set "on support" *(all "locks" types)*<br>* `withSupportLocked` -  skip modules set "on support" with prohibited modification *("yellow  closed lock")*<br>* `never` - skip no modules as support mode is not analyzed *(set by default)*
+⤷   `mode` | `String` | Setting for controlling the diagnostic settings accounting mode. Possible options: <br> * `OFF` - All diagnostics are considered to be turned off, regardless of their settings. <br> * `ON` - All diagnostics enabled by default are considered enabled, the rest - depending on personal settings <br> * `EXCEPT` - All diagnostics other than those specified are considered enabled. <br> * `ONLY` - Only the specified diagnostics are considered enabled. <br> * `ALL` - All diagnostics are considered enabled.
+⤷   `parameters` | `JSON-Объект` | Parameter is a collection of diagnostics parameters.  Collection items are json-objects with the following structure:<br>* *object key* - string, is diagnostic key<br>* *object value* - if is boolean, then interpreted as diagnostic off-switch (`false`) or on-switch with default parameters (`true`), if is type  `json-object`,  collection of diagnostic parameters.<br><br>Key, if set to ON by default and all allowed parameters and examples are given on the diagnostic page.
+`documentLink` | `JSON-Объект` | Contains documentation link settings
+⤷   `useDevSite` | `Булево` | When you turn on the settings, the resulting documentation links will lead to the develop version of the site. By default, the parameter is off ( *set to `false`* )
+⤷   `siteRoot` | `Строка` | The path to the root of the site with the documentation. By default, the parameter value is `"https://1c-syntax.github.io/bsl-language-server"`
+`traceLog` | `Строка` | To log all requests *(incoming and outgoing)* between **BSL Language Server** and **Language Client**  from used editor/IDE. this parameter sets log file path. The path can set either absolute or relative *(from project root)*, by default the value is not set.<br><br>**WARNING**<br><br>* When starting **BSL Language Server** overwrites this file <br>* Speed of interaction between client and server **DRAMATICALLY REDUCED**
+`configurationRoot` | `Строка` | This parameter is intended to indicate the root directory the 1C configuration files are located in the project directory. It can be useful if there are several configuration directories in the same project directory or when the structure of the project directory is so complex. By default, the parameter is empty and `BSL Language Server` determines the location of the configuration root directory independently
 
 You can use the following JSON schema to make it easier to compile and edit a configuration file:
 
@@ -25,9 +31,10 @@ https://1c-syntax.github.io/bsl-language-server/configuration/schema.json
 
 The following is an example of a settings:
 
--  Language of diagnostics messages - English;
+- Language of diagnostics messages - English;
 - Changes the diagnostic setting for [LineLength - Line Length limit](../diagnostics/LineLength.md), set the limit for the length of a string to 140 characters;
 - Disable [MethodSize - Method size restriction{/a0 } diagnostic.](../diagnostics/MethodSize.md)
+- Enables the calculation of diagnostics in continuous mode ( `computeTrigger = onType` )
 
 ```json
 {

From 42bbb86b7d1912934166c6bef00e390a33116a43 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:37:34 +0000
Subject: [PATCH 354/444] Translate ConfigurationFile.md via GitLocalize

---
 docs/en/features/ConfigurationFile.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/en/features/ConfigurationFile.md b/docs/en/features/ConfigurationFile.md
index b9bbf17e686..653dbc3db34 100644
--- a/docs/en/features/ConfigurationFile.md
+++ b/docs/en/features/ConfigurationFile.md
@@ -10,16 +10,16 @@ Name | Type | Description
 `codeLens` | `JSON-Object` | Contains the settings for displaying `lens` in advanced code editors / IDEs *(for example, [Visual Studio Code](https://code.visualstudio.com/) )* , which displays various information above a block of code.
 ⤷   `showCognitiveComplexity` | `Boolean` | In code editors/IDE with support codelens*(for example [Visual Studio Code](https://code.visualstudio.com/))*, enables displaying the value[ of the cognitive complexity](../diagnostics/CognitiveComplexity.md) of the method over its definition. By default is enabled (*is set to `true`*)
 ⤷   `showCyclomaticComplexity` | `Boolean` | Similar to `showCognitiveComplexityCodeLens`, enables the display of the [cyclomatic complexity](../diagnostics/CyclomaticComplexity.md) value   of the method. By default enabled (*is set to `true`*)
-`diagnostics` | `JSON-Объект` | Contains diagnostic settings
+`diagnostics` | `JSON-Object` | Contains diagnostic settings
 ⤷   `computeTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<em data-md-type="emphasis"><br> <code data-md-type="codespan">onSave</code> - when saving a file (<em data-md-type="emphasis">default</em>)</em><br> `never` - analysis will not be performed
 ⤷   `skipSupport` | `String` | This parameter sets **1C configuration** file skipping mode *(for example files are not analyzed for issues)* which are "on support" from vendor configuration. Possible values:<br>* `withSupport` - skip all modules set "on support" *(all "locks" types)*<br>* `withSupportLocked` -  skip modules set "on support" with prohibited modification *("yellow  closed lock")*<br>* `never` - skip no modules as support mode is not analyzed *(set by default)*
 ⤷   `mode` | `String` | Setting for controlling the diagnostic settings accounting mode. Possible options: <br> * `OFF` - All diagnostics are considered to be turned off, regardless of their settings. <br> * `ON` - All diagnostics enabled by default are considered enabled, the rest - depending on personal settings <br> * `EXCEPT` - All diagnostics other than those specified are considered enabled. <br> * `ONLY` - Only the specified diagnostics are considered enabled. <br> * `ALL` - All diagnostics are considered enabled.
-⤷   `parameters` | `JSON-Объект` | Parameter is a collection of diagnostics parameters.  Collection items are json-objects with the following structure:<br>* *object key* - string, is diagnostic key<br>* *object value* - if is boolean, then interpreted as diagnostic off-switch (`false`) or on-switch with default parameters (`true`), if is type  `json-object`,  collection of diagnostic parameters.<br><br>Key, if set to ON by default and all allowed parameters and examples are given on the diagnostic page.
-`documentLink` | `JSON-Объект` | Contains documentation link settings
-⤷   `useDevSite` | `Булево` | When you turn on the settings, the resulting documentation links will lead to the develop version of the site. By default, the parameter is off ( *set to `false`* )
-⤷   `siteRoot` | `Строка` | The path to the root of the site with the documentation. By default, the parameter value is `"https://1c-syntax.github.io/bsl-language-server"`
-`traceLog` | `Строка` | To log all requests *(incoming and outgoing)* between **BSL Language Server** and **Language Client**  from used editor/IDE. this parameter sets log file path. The path can set either absolute or relative *(from project root)*, by default the value is not set.<br><br>**WARNING**<br><br>* When starting **BSL Language Server** overwrites this file <br>* Speed of interaction between client and server **DRAMATICALLY REDUCED**
-`configurationRoot` | `Строка` | This parameter is intended to indicate the root directory the 1C configuration files are located in the project directory. It can be useful if there are several configuration directories in the same project directory or when the structure of the project directory is so complex. By default, the parameter is empty and `BSL Language Server` determines the location of the configuration root directory independently
+⤷   `parameters` | `JSON-Object` | Parameter is a collection of diagnostics parameters.  Collection items are json-objects with the following structure:<br>* *object key* - string, is diagnostic key<br>* *object value* - if is boolean, then interpreted as diagnostic off-switch (`false`) or on-switch with default parameters (`true`), if is type  `json-object`,  collection of diagnostic parameters.<br><br>Key, if set to ON by default and all allowed parameters and examples are given on the diagnostic page.
+`documentLink` | `JSON-Object` | Contains documentation link settings
+⤷   `useDevSite` | `Boolean` | When you turn on the settings, the resulting documentation links will lead to the develop version of the site. By default, the parameter is off ( *set to `false`* )
+⤷   `siteRoot` | `String` | The path to the root of the site with the documentation. By default, the parameter value is `"https://1c-syntax.github.io/bsl-language-server"`
+`traceLog` | `String` | To log all requests *(incoming and outgoing)* between **BSL Language Server** and **Language Client**  from used editor/IDE. this parameter sets log file path. The path can set either absolute or relative *(from project root)*, by default the value is not set.<br><br>**WARNING**<br><br>* When starting **BSL Language Server** overwrites this file <br>* Speed of interaction between client and server **DRAMATICALLY REDUCED**
+`configurationRoot` | `String` | This parameter is intended to indicate the root directory the 1C configuration files are located in the project directory. It can be useful if there are several configuration directories in the same project directory or when the structure of the project directory is so complex. By default, the parameter is empty and `BSL Language Server` determines the location of the configuration root directory independently
 
 You can use the following JSON schema to make it easier to compile and edit a configuration file:
 

From 0ab033d3bfa091460d89326176bab61f02619d7d Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:35 +0000
Subject: [PATCH 355/444] Translate CommonModuleAssign.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleAssign.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
index a369b54a9b6..b5677b9b7b9 100644
--- a/docs/en/diagnostics/CommonModuleAssign.md
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -1,28 +1,33 @@
 # CommonModuleAssign (CommonModuleAssign)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `2` | `error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `2` | `error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+When assigning a value to a common module, an exception will be thrown. This situation is possible when a common module with a name that is already used for a variable is added to the configuration.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleAssign-off
-// BSLLS:CommonModuleAssign-on
+// BSLLS:CommonModuleAssign-off // BSLLS:CommonModuleAssign-on
 ```
 
 ### Parameter for config

From 1b5d77bcb29262f75593b9b54ac4e46e7065fd0f Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:37 +0000
Subject: [PATCH 356/444] Translate CommonModuleNameCached.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameCached.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
index 50b09f36785..fe6ea59a685 100644
--- a/docs/en/diagnostics/CommonModuleNameCached.md
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -1,28 +1,37 @@
 # Missed postfix "Cached" (CommonModuleNameCached)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Модули, предназначенные для реализации на сервере или на клиенте функций с повторным использованием возвращаемых значений (на время вызова или на время сеанса), именуются с постфиксом "ПовтИсп" (англ. "Cached") и "КлиентПовтИсп" (англ. "ClientCached") соответственно.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesClientCached, UsersInternalCached
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Rules for creating common modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.3)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameCached-off
-// BSLLS:CommonModuleNameCached-on
+// BSLLS:CommonModuleNameCached-off // BSLLS:CommonModuleNameCached-on
 ```
 
 ### Parameter for config

From baabe30adfc257c4be4229d3c8f28b4c82acf362 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:38 +0000
Subject: [PATCH 357/444] Translate CommonModuleNameCached.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameCached.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
index fe6ea59a685..2b0976efa38 100644
--- a/docs/en/diagnostics/CommonModuleNameCached.md
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -10,7 +10,7 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Модули, предназначенные для реализации на сервере или на клиенте функций с повторным использованием возвращаемых значений (на время вызова или на время сеанса), именуются с постфиксом "ПовтИсп" (англ. "Cached") и "КлиентПовтИсп" (англ. "ClientCached") соответственно.
+Modules intended for implementing functions on the server or client with cached of the returned values (for the time of the call or for the session) are named with the postfix "Cached" and "ClientCached" respectively.
 
 ## Examples
 

From 216f0e9770ce4bc2b0a84880b9b142d513ecb98c Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:39 +0000
Subject: [PATCH 358/444] Translate CommonModuleNameClient.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameClient.md | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
index 0dacb3136d2..05f2e88ba7a 100644
--- a/docs/en/diagnostics/CommonModuleNameClient.md
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -1,28 +1,44 @@
 # Missed postfix "Client" (CommonModuleNameClient)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Клиентские общие модули содержат клиентскую бизнес-логику (функциональность, определенную только для клиента) и имеют признаки:
+
+- Client (Managed application)
+- Client (Ordinary application)
+
+Исключение составляют случаи, когда клиентские процедуры и функции должны быть доступны только в режиме управляемого приложения (только в режиме обычного приложения или только в режиме внешнего соединения). В таких случаях, допустима иная комбинация двух этих признаков.
+
+Client common modules are named with the "Client" postfix. Except when the Global flag is on.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesClient, CommonClient, StandardSubsystemsClient
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameClient-off
-// BSLLS:CommonModuleNameClient-on
+// BSLLS:CommonModuleNameClient-off // BSLLS:CommonModuleNameClient-on
 ```
 
 ### Parameter for config

From 2a3737a0c86f1a126a549a9bdc2cb66c62124ae2 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:40 +0000
Subject: [PATCH 359/444] Translate CommonModuleNameClient.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameClient.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
index 05f2e88ba7a..b744d05e939 100644
--- a/docs/en/diagnostics/CommonModuleNameClient.md
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -10,12 +10,12 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Клиентские общие модули содержат клиентскую бизнес-логику (функциональность, определенную только для клиента) и имеют признаки:
+Client common modules contain client business logic (functionality specific to the client only) and have the following features:
 
 - Client (Managed application)
 - Client (Ordinary application)
 
-Исключение составляют случаи, когда клиентские процедуры и функции должны быть доступны только в режиме управляемого приложения (только в режиме обычного приложения или только в режиме внешнего соединения). В таких случаях, допустима иная комбинация двух этих признаков.
+In cases where client methods should be available only in managed application mode (or only in regular application mode or only in external connection mode), a different combination of these two features is allowed.
 
 Client common modules are named with the "Client" postfix. Except when the Global flag is on.
 

From 1411444f100b8d6fb1de56c0ede115df8107e7eb Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:42 +0000
Subject: [PATCH 360/444] Translate CommonModuleNameServerCall.md via
 GitLocalize

---
 .../diagnostics/CommonModuleNameServerCall.md | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index 6acca29eaa6..d3a2e1d5a53 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -1,28 +1,41 @@
 # Missed postfix "ServerCall" (CommonModuleNameServerCall)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Серверные общие модули для вызова с клиента содержат серверные процедуры и функции, доступные для использования из клиентского кода. Они составляют клиентский программный интерфейс сервера приложения. Такие процедуры и функции размещаются в общих модулях с признаком:
+
+- Server (ServerCall is enabled)
+
+Серверные общие модули для вызова с клиента называются по общим правилам именования объектов метаданных и должны именоваться с постфиксом "ВызовСервера" (англ. "ServerCall").
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesServerCall, CommonServerCall
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameServerCall-off
-// BSLLS:CommonModuleNameServerCall-on
+// BSLLS:CommonModuleNameServerCall-off // BSLLS:CommonModuleNameServerCall-on
 ```
 
 ### Parameter for config

From 4f589f8b58606e2f44ae1ceb18846a559699aad0 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:43 +0000
Subject: [PATCH 361/444] Translate CommonModuleNameServerCall.md via
 GitLocalize

---
 docs/en/diagnostics/CommonModuleNameServerCall.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index d3a2e1d5a53..b5ec3557db5 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -10,11 +10,11 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Серверные общие модули для вызова с клиента содержат серверные процедуры и функции, доступные для использования из клиентского кода. Они составляют клиентский программный интерфейс сервера приложения. Такие процедуры и функции размещаются в общих модулях с признаком:
+Server common modules for calling from the client code contain server methods available for use from client code. It forms the application server client interface. Such methods are placed in common modules with the attribute:
 
 - Server (ServerCall is enabled)
 
-Серверные общие модули для вызова с клиента называются по общим правилам именования объектов метаданных и должны именоваться с постфиксом "ВызовСервера" (англ. "ServerCall").
+Server common modules for calling from the client must be named with the postfix "ServerCall"
 
 ## Examples
 

From 4be5d43c551973454da691cdda6e6ee8e2cef3a6 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:44 +0000
Subject: [PATCH 362/444] Translate CommonModuleNameFullAccess.md via
 GitLocalize

---
 .../diagnostics/CommonModuleNameFullAccess.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
index c618cba4bbf..3144add9a75 100644
--- a/docs/en/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -1,28 +1,37 @@
 # Missed postfix "FullAccess" (CommonModuleNameFullAccess)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Security Hotspot` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Security Hotspot` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Модули, выполняющиеся в привилегированном режиме, имеющие признак Привилегированный, именуются с постфиксом "ПолныеПрава" (англ. "FullAccess").
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesFullAccess
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameFullAccess-off
-// BSLLS:CommonModuleNameFullAccess-on
+// BSLLS:CommonModuleNameFullAccess-off // BSLLS:CommonModuleNameFullAccess-on
 ```
 
 ### Parameter for config

From 731e694479a6bdc84e825fa498102cb07b9cd57c Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:45 +0000
Subject: [PATCH 363/444] Translate CommonModuleNameFullAccess.md via
 GitLocalize

---
 docs/en/diagnostics/CommonModuleNameFullAccess.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
index 3144add9a75..eb5f07f8dad 100644
--- a/docs/en/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -10,7 +10,7 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Модули, выполняющиеся в привилегированном режиме, имеющие признак Привилегированный, именуются с постфиксом "ПолныеПрава" (англ. "FullAccess").
+Modules executed in privileged mode have the Privileged flag, are named with the "FullAccess" postfix.
 
 ## Examples
 

From b8fde3e0f1cd1355b2d75846da9de4cacd99b135 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:46 +0000
Subject: [PATCH 364/444] Translate CommonModuleNameGlobal.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameGlobal.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
index 4ebf0d85dd7..0d25401afaa 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -1,28 +1,37 @@
 # Missed postfix "Global" (CommonModuleNameGlobal)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`brainoverload`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"), в этом случае постфикс "Клиент" добавлять не следует.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesGlobal, InfobaseUpdateGlobal
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:2.2)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameGlobal-off
-// BSLLS:CommonModuleNameGlobal-on
+// BSLLS:CommonModuleNameGlobal-off // BSLLS:CommonModuleNameGlobal-on
 ```
 
 ### Parameter for config

From d67a1bbc9e2d0797660a33ffd47ee4a1618a297c Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:48 +0000
Subject: [PATCH 365/444] Translate CommonModuleNameGlobal.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameGlobal.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
index 0d25401afaa..cbe16e6d808 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -10,7 +10,7 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"), в этом случае постфикс "Клиент" добавлять не следует.
+For global modules, the "Global" postfix is added, "Client" postfix should not be added.
 
 ## Examples
 

From 2fa98660644a80f082b0b27c7ab6709ad8793105 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:49 +0000
Subject: [PATCH 366/444] Translate CommonModuleNameGlobalClient.md via
 GitLocalize

---
 .../CommonModuleNameGlobalClient.md           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index 0aab72877fc..d1913c40afe 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -1,28 +1,39 @@
 # Global module with postfix "Client" (CommonModuleNameGlobalClient)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"), в этом случае постфикс "Клиент" добавлять не следует.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+НеПравильно: РаботаСФайламиГлобальныйКлиент, InfobaseUpdateGlobalClient
+
+Правильно: РаботаСФайламиГлобальный, InfobaseUpdateGlobal
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:3.2.1)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameGlobalClient-off
-// BSLLS:CommonModuleNameGlobalClient-on
+// BSLLS:CommonModuleNameGlobalClient-off // BSLLS:CommonModuleNameGlobalClient-on
 ```
 
 ### Parameter for config

From 651f3ae67a33f257ce6abd6cb558a36c153b4318 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:50 +0000
Subject: [PATCH 367/444] Translate CommonModuleNameGlobalClient.md via
 GitLocalize

---
 docs/en/diagnostics/CommonModuleNameGlobalClient.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index d1913c40afe..204219b29a2 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -10,15 +10,15 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Для глобальных модулей добавляется постфикс "Глобальный" (англ. "Global"), в этом случае постфикс "Клиент" добавлять не следует.
+For global modules, the "Global" postfix is added, "Client" postfix should not be added.
 
 ## Examples
 
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
-НеПравильно: РаботаСФайламиГлобальныйКлиент, InfobaseUpdateGlobalClient
+Incorrect: InfobaseUpdateGlobalClient
 
-Правильно: РаботаСФайламиГлобальный, InfobaseUpdateGlobal
+Correct: InfobaseUpdateGlobal
 
 ## Sources
 

From 2dd87294fe507818731796abcc15d3f5cbc3d096 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:51 +0000
Subject: [PATCH 368/444] Translate ExecuteExternalCode.md via GitLocalize

---
 docs/en/diagnostics/ExecuteExternalCode.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/ExecuteExternalCode.md b/docs/en/diagnostics/ExecuteExternalCode.md
index ee0491d746d..32465d2beb3 100644
--- a/docs/en/diagnostics/ExecuteExternalCode.md
+++ b/docs/en/diagnostics/ExecuteExternalCode.md
@@ -1,28 +1,38 @@
 # Executing of external code on the server (ExecuteExternalCode)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Vulnerability` | `BSL` | `Critical` | `Yes` | `1` | `error`<br/>`standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Vulnerability` | `BSL` | `Critical` | `Yes` | `1` | `error`<br>`standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.
+ Запрещено использование методов `Выполнить` и `Вычислить` в серверных методах модулей форм, команд, объектов и т.д.
+
+**The restriction does not apply to code executed on the client.**
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+- [Restrictions on the use of Execute and Eval on the server (RU)](https://its.1c.ru/db/v8std#content:770:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ExecuteExternalCode-off
-// BSLLS:ExecuteExternalCode-on
+// BSLLS:ExecuteExternalCode-off // BSLLS:ExecuteExternalCode-on
 ```
 
 ### Parameter for config

From 8292340754c3f3416a2816e7ac092a343ad2e6ff Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:52 +0000
Subject: [PATCH 369/444] Translate ExecuteExternalCode.md via GitLocalize

---
 docs/en/diagnostics/ExecuteExternalCode.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/diagnostics/ExecuteExternalCode.md b/docs/en/diagnostics/ExecuteExternalCode.md
index 32465d2beb3..890556de909 100644
--- a/docs/en/diagnostics/ExecuteExternalCode.md
+++ b/docs/en/diagnostics/ExecuteExternalCode.md
@@ -10,8 +10,8 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.
- Запрещено использование методов `Выполнить` и `Вычислить` в серверных методах модулей форм, команд, объектов и т.д.
+It is dangerous to use not only direct execution of code written in the Enterprise mode, but also algorithms where `Execute` or `Eval` code executes the code in server methods.
+It is forbidden to use the methods `Execute ` and `Eval` in server methods of modules: forms, commands, objects, etc.
 
 **The restriction does not apply to code executed on the client.**
 

From 4faa2945d9ef4b9efde510976f13e05cf2c29610 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:54 +0000
Subject: [PATCH 370/444] Translate ExecuteExternalCodeInCommonModule.md via
 GitLocalize

---
 .../ExecuteExternalCodeInCommonModule.md      | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
index 4441a568a55..1ec1410c8d0 100644
--- a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
+++ b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -1,28 +1,38 @@
 # Executing of external code in a common module on the server (ExecuteExternalCodeInCommonModule)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `badpractice`<br/>`standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `badpractice`<br>`standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.
+ Если выполнение произвольного кода необходимо, то такой код должен предварительно располагаться в общем модуле и пройти аудит.
+
+**The restriction does not apply to code executed on the client.**
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+- [Restrictions on the use of Execute and Eval on the server (RU)](https://its.1c.ru/db/v8std#content:770:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ExecuteExternalCodeInCommonModule-off
-// BSLLS:ExecuteExternalCodeInCommonModule-on
+// BSLLS:ExecuteExternalCodeInCommonModule-off // BSLLS:ExecuteExternalCodeInCommonModule-on
 ```
 
 ### Parameter for config

From 1ee7c5008126c6a30d519a0ea3c7aa85944f0a15 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:37:55 +0000
Subject: [PATCH 371/444] Translate ExecuteExternalCodeInCommonModule.md via
 GitLocalize

---
 docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
index 1ec1410c8d0..e8516b44c5e 100644
--- a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
+++ b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -10,8 +10,8 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-При разработке решений следует учитывать, что опасно использование не только непосредственного выполнения кода, написанного в режиме Предприятие, но и алгоритмов, где методами `Выполнить` или `Вычислить` исполняется код в серверных функциях и процедурах.
- Если выполнение произвольного кода необходимо, то такой код должен предварительно располагаться в общем модуле и пройти аудит.
+It is dangerous to use not only direct execution of code written in the Enterprise mode, but also algorithms where `Execute` or `Eval` code executes the code in server methods.
+If it is necessary to execute external code, then it must be located in a common module and pass an audit in advance.
 
 **The restriction does not apply to code executed on the client.**
 

From f3bc1bf0e62e3f6d8adf53357958aa7b9c3b3232 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:56 +0000
Subject: [PATCH 372/444] Translate ExcessiveAutoTestCheck.md via GitLocalize

---
 docs/en/diagnostics/ExcessiveAutoTestCheck.md | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/docs/en/diagnostics/ExcessiveAutoTestCheck.md b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
index 3c840787b83..b79d70e0ab4 100644
--- a/docs/en/diagnostics/ExcessiveAutoTestCheck.md
+++ b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
@@ -1,23 +1,39 @@
 # Excessive AutoTest Check (ExcessiveAutoTestCheck)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`deprecated` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`deprecated`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+Standard 772, Interaction with Automated Testing Tools, has been canceled. In this regard, verification of the "АвтоТест" parameter in the form code is no longer necessary.
 
 ## Examples
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+```bsl
+If Parameters.Property("АвтоТест") Then
+    Return;
+EndIf;
+```
+
+and in handler Filling in object module:
+
+```bsl
+If FillData = "АвтоТест" Then
+    Return;
+EndIf;
+```
 
 ## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+- Источник: [Standard: Modules. Part 3 (RU)](https://its.1c.ru/db/v8std#content:456:hdoc:3)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 6ead784b583d7e0e721ae22ba17ebe0a3bbafb9d Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:37:58 +0000
Subject: [PATCH 373/444] Translate index.md via GitLocalize

---
 docs/en/index.md | 40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/docs/en/index.md b/docs/en/index.md
index 2a8783d2cb3..8214d08c2cc 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -1,15 +1,6 @@
 # BSL Language Server
 
-[![Actions Status](https://github.com/1c-syntax/bsl-language-server/workflows/Java%20CI/badge.svg)](https://github.com/1c-syntax/bsl-language-server/actions)
-[![Download](https://img.shields.io/github/release/1c-syntax/bsl-language-server.svg?label=download&style=flat)](https://github.com/1c-syntax/bsl-language-server/releases/latest)
-[![JitPack](https://jitpack.io/v/1c-syntax/bsl-language-server.svg)](https://jitpack.io/#1c-syntax/bsl-language-server)
-[![GitHub Releases](https://img.shields.io/github/downloads/1c-syntax/bsl-language-server/latest/total?style=flat-square)](https://github.com/1c-syntax/bsl-language-server/releases)
-[![GitHub All Releases](https://img.shields.io/github/downloads/1c-syntax/bsl-language-server/total?style=flat-square)](https://github.com/1c-syntax/bsl-language-server/releases)
-[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
-[![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_bsl-language-server&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_bsl-language-server)
-[![Benchmark](bench/benchmark.svg)](bench/index.html)
-[![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server)
+[](https://github.com/1c-syntax/bsl-language-server/actions)![Actions Status](https://github.com/1c-syntax/bsl-language-server/workflows/Java%20CI/badge.svg)
 
 [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) implementation for 1C (BSL) - 1C:Enterprise 8 and [OneScript](http://oscript.io) languages.
 
@@ -71,28 +62,15 @@ By default diagnostics texts are displayed in Russian. To switch the diagnostics
 
 ## Run in analyzer mode
 
-To run in analyzer mode use parameter `--analyze` (short `-a`). 
+To run in analyzer mode use parameter `--analyze` (short `-a`).
 
 ```sh
-Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]
-                                   [-r=<keys>]...
-Run analysis and get diagnostic info
-  -c, --configuration=<path>
-                           Path to language server configuration file
-  -h, --help               Show this help message and exit
-  -o, --outputDir=<path>   Output report directory
-  -q, --silent             Silent mode
-  -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)
-  -s, --srcDir=<path>      Source directory
-  -w, --workspaceDir=<path> 
-                           Workspace directory
+Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]                                    [-r=<keys>]... Run analysis and get diagnostic info   -c, --configuration=<path>                            Path to language server configuration file   -h, --help               Show this help message and exit   -o, --outputDir=<path>   Output report directory   -q, --silent             Silent mode   -r, --reporter=<keys>    Reporter key (console, junit, json, tslint, generic)   -s, --srcDir=<path>      Source directory   -w, --workspaceDir=<path>                             Workspace directory
 ```
 
-To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder.
+To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder. To generate an analysis report you need to specify one or more reporters. To specify reporter use parameter `--reporter` or `-r`, followed by reporter key. You may specify several reporters. The list of reporters see in section  **Reporters**.
 
-To generate an analysis report you need to specify one or more reporters. To specify reporter use parameter `--reporter` or `-r`, followed by reporter key. You may specify several reporters. The list of reporters see in section  **Reporters**.
 
-Command line example to run analysis:
 
 ```sh
 java -jar bsl-language-server.jar --analyze --srcDir ./src/cf --reporter json
@@ -108,7 +86,7 @@ java -Xmx4g -jar bsl-language-server.jar ... other parameters
 
 ## Run in formatter mode
 
-To run in formatter mode use parameter `--format` (short `-f`). 
+To run in formatter mode use parameter `--format` (short `-f`).
 
 ```sh
 Usage: bsl-language-server format [-hq] [-s=<path>]
@@ -132,8 +110,6 @@ java -jar bsl-language-server.jar --format --srcDir ./src/cf
 
 A detailed description of the configuration file is given on [this page](features/ConfigurationFile.md)
 
-<a id="thanks"></a>
-
 ## Special thanks
 
 Many thanks to all [contributors](https://github.com/1c-syntax/bsl-language-server/graphs/contributors) to the project, to all who participated in the discussions, who helped with the testing.
@@ -144,15 +120,15 @@ Thanks to companies supporting open source projects, and especially to those who
 
 ---
 
-[![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com)
+[](https://www.yourkit.com)![YourKit](https://www.yourkit.com/images/yklogo.png)
 
-[YourKit, LLC](https://www.yourkit.com) is the creator of innovative and intelligent tools for profiling Java and .NET applications. YourKit has offered an open source license `YourKit Java Profiler` for `BSL Language Server` to improve its performance.
+{a0 href="https://www.yourkit.com"}YourKit, LLC{/a0} is the creator of innovative and intelligent tools for profiling `Java` and `.NET` applications. YourKit has offered an open source license [YourKit Java Profiler](https://www.yourkit.com) for `BSL Language Server` to improve its performance.
 
 With `YourKit Java Profiler` we profile and improve project performance.
 
 ---
 
-[![JetBrains](https://github.com/1c-syntax/bsl-language-server/blob/develop/docs/assets/images/jetbrains-variant-4.png?raw=true)](https://www.jetbrains.com)
+[](https://www.jetbrains.com)![JetBrains](assets/images/jetbrains-variant-4.png)
 
 [JetBrains](https://www.jetbrains.com) is the creator of professional software for development. JetBrains has offered an open source license for his products, including `IntelliJ IDEA Ultimate`.
 

From 42f408f8c56453fdc5c88a5e40328fd89b489f3b Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:37:59 +0000
Subject: [PATCH 374/444] Translate index.md via GitLocalize


From de746227f132f59bd36f02a09f8588a4ac15244e Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:00 +0000
Subject: [PATCH 375/444] Translate IsInRoleMethodDiagnostic.md via GitLocalize

---
 .../diagnostics/IsInRoleMethodDiagnostic.md   | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index f75b6eeb646..381a3ac9f6b 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -1,51 +1,55 @@
 # IsInRole global method call (IsInRoleMethodDiagnostic)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
 To check access rights in the code, use the AccessRight method.
 
-When a role does not grant access rights to metadata objects and defines an additional access right only, 
-use the IsInRole method. If Standard Subsystems Library is used in a configuration,
-use the RolesAvailable function of the Users common module, otherwise IsInRole method call must be combined with
-PrivilegedMode() method call.
+When a role does not grant access rights to metadata objects and defines an additional access right only, use the IsInRole method. If Standard Subsystems Library is used in a configuration, use the RolesAvailable function of the Users common module, otherwise IsInRole method call must be combined with PrivilegedMode() method call.
+
+При использовании в конфигурации Библиотеки стандартных подсистем (БСП) следует использовать функцию РолиДоступны общего модуля Пользователи. Если в конфигурации не используется БСП, следует обязательно совмещать вызов РольДоступна() с проверкой на ПривилегированныйРежим().
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
 ```
-Incorrect:
-If IsInRole("AddChangeWorldCountries") Then ...
-If IsInRole("ViewPopularCountriesReport") Then ...
+Incorrect: If IsInRole("AddChangeWorldCountries") Then ... If IsInRole("ViewPopularCountriesReport") Then ...
 ```
+
 ```
-Correct example:
-If AccessRight("Edit", Metadata.Catalogs.WorldCountries) Then ...
-If AccessRight("View", Metadata.Reports.PopularCountries) Then ...
+Correct example: If AccessRight("Edit", Metadata.Catalogs.WorldCountries) Then ... If AccessRight("View", Metadata.Reports.PopularCountries) Then ...
 ```
+
 ```
-Incorrect:
-If IsInRole("Paymaster") Then ...
+Incorrect: If IsInRole("Paymaster") Then ...
 ```
+
 ```
-Correct example:
-If IsInRole("Paymaster") OR PrivilegedMode() Then ...
+Correct example: If IsInRole("Paymaster") OR PrivilegedMode() Then ...
 ```
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-Source: [Standard: Checking access rights](https://support.1ci.com/hc/en-us/articles/360011003180-Checking-access-rights)
+- [Standard: Checking access rights](https://support.1ci.com/hc/en-us/articles/360011003180-Checking-access-rights)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:IsInRoleMethodDiagnostic-off
-// BSLLS:IsInRoleMethodDiagnostic-on
+// BSLLS:IsInRoleMethodDiagnostic-off // BSLLS:IsInRoleMethodDiagnostic-on
 ```
 
 ### Parameter for config

From e105f93e4170395fff9642f661457eaf5d979c2a Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Fri, 22 May 2020 13:38:01 +0000
Subject: [PATCH 376/444] Translate IsInRoleMethodDiagnostic.md via GitLocalize

---
 docs/en/diagnostics/IsInRoleMethodDiagnostic.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index 381a3ac9f6b..922a154cd0f 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -14,7 +14,7 @@ To check access rights in the code, use the AccessRight method.
 
 When a role does not grant access rights to metadata objects and defines an additional access right only, use the IsInRole method. If Standard Subsystems Library is used in a configuration, use the RolesAvailable function of the Users common module, otherwise IsInRole method call must be combined with PrivilegedMode() method call.
 
-При использовании в конфигурации Библиотеки стандартных подсистем (БСП) следует использовать функцию РолиДоступны общего модуля Пользователи. Если в конфигурации не используется БСП, следует обязательно совмещать вызов РольДоступна() с проверкой на ПривилегированныйРежим().
+If Standard Subsystems Library is used in a configuration, use the RolesAvailable() function of the Users common module, otherwise IsInRole() method call must be combined with PrivilegedMode() method call.
 
 ## Examples
 

From 155ea80131c438f6c0d4d8a3278303f14e85b1b6 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:03 +0000
Subject: [PATCH 377/444] Translate DataExchangeLoading.md via GitLocalize

---
 docs/en/diagnostics/DataExchangeLoading.md | 62 +++++++++-------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/docs/en/diagnostics/DataExchangeLoading.md b/docs/en/diagnostics/DataExchangeLoading.md
index 0bb7e628d79..749ff03962b 100644
--- a/docs/en/diagnostics/DataExchangeLoading.md
+++ b/docs/en/diagnostics/DataExchangeLoading.md
@@ -1,72 +1,62 @@
 # There is no check for the attribute DataExchange.Load in the object's event handler (DataExchangeLoading)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Critical` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL` | `Critical` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `findFirst` | `Boolean` | ```Check should go first``` | ```false``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`findFirst` | `Boolean` | `Check should go first` | `false`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+All actions in the event-handler procedures BeforeWrite, OnWrite, BeforeDelete should be performed after checking for DataExchange.Load.
+
+This is necessary so that no business logic of the object is executed when writing the object through the data exchange mechanism, since it has already been executed for the object in the node where it was created.
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 Bad:
-```bsl
-Procedure BeforeWrite(Cancel)
 
-    If Not Cancel Then
-        RandomAlgorithm();
-    EndIf;
-
-    // code handler
-    //
-    // ...
-    
-EndProcedure
+```bsl
+Procedure BeforeWrite(Cancel)      If Not Cancel Then         RandomAlgorithm();     EndIf;      // code handler     //     // ...      EndProcedure
 ```
 
 Good:
+
 ```bsl
-Procedure BeforeWrite(Cancel)
-    If DataExchange.Load Then
-         Return;
-    EndIf;
-
-    // code handler
-    // ...
-EndProcedure
+Procedure BeforeWrite(Cancel)     If DataExchange.Load Then          Return;     EndIf;      // code handler     // ... EndProcedure
 ```
 
 ## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-* [Стандарт: Использование признака ОбменДанными.Загрузка в обработчиках событий объекта](https://its.1c.ru/db/v8std#content:773)
-* [Обработчик события ПриЗаписи](https://its.1c.ru/db/v8std#content:465)
-* [Обработчик события ПередЗаписью](https://its.1c.ru/db/v8std#content:464)
-* [Обработчик события ПередУдалением](https://its.1c.ru/db/v8std#content:752)
+- [Standard: Using DataExchange.Load in object handlers (RU)](https://its.1c.ru/db/v8std#content:773)
+- [Handler OnWrite (RU)](https://its.1c.ru/db/v8std#content:465)
+- [Handler BeforeWrite (RU)](https://its.1c.ru/db/v8std#content:464)
+- [Handler BeforeDelete (RU)](https://its.1c.ru/db/v8std#content:752)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DataExchangeLoading-off
-// BSLLS:DataExchangeLoading-on
+// BSLLS:DataExchangeLoading-off // BSLLS:DataExchangeLoading-on
 ```
 
 ### Parameter for config
 
 ```json
-"DataExchangeLoading": {
-    "findFirst": false
-}
+"DataExchangeLoading": {     "findFirst": false }
 ```

From 8d91cde47d4a3a42bd972897a4ef375fba8390b5 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:04 +0000
Subject: [PATCH 378/444] Translate MissingVariablesDescription.md via
 GitLocalize

---
 .../MissingVariablesDescription.md            | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/docs/en/diagnostics/MissingVariablesDescription.md b/docs/en/diagnostics/MissingVariablesDescription.md
index 38063226d26..f00ab3c5c21 100644
--- a/docs/en/diagnostics/MissingVariablesDescription.md
+++ b/docs/en/diagnostics/MissingVariablesDescription.md
@@ -1,17 +1,23 @@
 # All variables declarations must have a description (MissingVariablesDescription)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
 All module variables and export variables must have comments.
 
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+
+## Sources
+
 Incorrect:
 
 ```bsl
@@ -21,26 +27,23 @@ Var Context;
 Correct:
 
 ```bsl
-Var Context; // Detailed description that explains the purpose of the variable
-
-// Detailed description that explains the purpose of the variable
-Var Context;
+Var Context; // Detailed description that explains the purpose of the variable  // Detailed description that explains the purpose of the variable Var Context;
 ```
 
-## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+## Snippets
 
+<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-* Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
+- Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:MissingVariablesDescription-off
-// BSLLS:MissingVariablesDescription-on
+// BSLLS:MissingVariablesDescription-off // BSLLS:MissingVariablesDescription-on
 ```
 
 ### Parameter for config

From cad609b8203252c4829f7b17cec4cdd263662837 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:06 +0000
Subject: [PATCH 379/444] Translate ThisObjectAssign.md via GitLocalize

---
 docs/en/diagnostics/ThisObjectAssign.md | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/ThisObjectAssign.md b/docs/en/diagnostics/ThisObjectAssign.md
index 47de0f67877..f427b60f3de 100644
--- a/docs/en/diagnostics/ThisObjectAssign.md
+++ b/docs/en/diagnostics/ThisObjectAssign.md
@@ -1,23 +1,31 @@
 # ThisObject assign (ThisObjectAssign)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL` | `Blocker` | `Yes` | `1` | `error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+In managed form modules and common modules, there should not be a variable named "ThisObject".
+
+Often this error appears when updating the platform version: the "ThisObject" property of managed forms and common modules appeared in version 8.3.3, which could previously be used as a variable name.
 
 ## Examples
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
-## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
+Wrong:
 
+```bsl
+ThisObject = FormAttributeToValue("Object");
+```
+
+## Sources
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 14059de58fd9c84b30729b41e809e200f0241065 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:07 +0000
Subject: [PATCH 380/444] Translate CodeBlockBeforeSub.md via GitLocalize

---
 docs/en/diagnostics/CodeBlockBeforeSub.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/docs/en/diagnostics/CodeBlockBeforeSub.md b/docs/en/diagnostics/CodeBlockBeforeSub.md
index 8d7e572230e..7f12db31f6b 100644
--- a/docs/en/diagnostics/CodeBlockBeforeSub.md
+++ b/docs/en/diagnostics/CodeBlockBeforeSub.md
@@ -1,10 +1,11 @@
 # Method definitions must be placed before the module body operators (CodeBlockBeforeSub)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `5` | `error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `5` | `error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -24,30 +25,23 @@ Based on the structure described above, the location of the program code before
 Wrong
 
 ```bsl
-Method();
-Message("Before methods");
-
-Procedure Method()
-// Method body
-EndProcedure
+Method(); Message("Before methods");  Procedure Method() // Method body EndProcedure
 ```
 
 ## Sources
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - [Module structure](https://its.1c.ru/db/v8std/content/455/hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CodeBlockBeforeSub-off
-// BSLLS:CodeBlockBeforeSub-on
+// BSLLS:CodeBlockBeforeSub-off // BSLLS:CodeBlockBeforeSub-on
 ```
 
 ### Parameter for config

From b5ee97d284582b536022814376b0f7e539cf63ca Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:08 +0000
Subject: [PATCH 381/444] Translate CyclomaticComplexity.md via GitLocalize

---
 docs/en/diagnostics/CyclomaticComplexity.md | 67 +++++----------------
 1 file changed, 14 insertions(+), 53 deletions(-)

diff --git a/docs/en/diagnostics/CyclomaticComplexity.md b/docs/en/diagnostics/CyclomaticComplexity.md
index 7284e57f48e..c2dfe888371 100644
--- a/docs/en/diagnostics/CyclomaticComplexity.md
+++ b/docs/en/diagnostics/CyclomaticComplexity.md
@@ -1,23 +1,23 @@
 # Cyclomatic complexity (CyclomaticComplexity)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `25` | `brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `25` | `brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `complexityThreshold` | `Integer` | ```Complexity threshold``` | ```20``` |
-| `checkModuleBody` | `Boolean` | ```Check module body``` | ```true``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`complexityThreshold` | `Integer` | `Complexity threshold` | `20`
+`checkModuleBody` | `Boolean` | `Check module body` | `true`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-Cyclomatic complexity of the program code is one of the oldest metrics, it was first mentioned by Thomas McCab in 1976.
- Cyclomatic complexity shows the minimum number of required tests. The most effective way to reduce cyclomatic complexity is to decompose the code, split the methods into simpler ones, and also optimize logical expressions.
+Cyclomatic complexity of the program code is one of the oldest metrics, it was first mentioned by Thomas McCab in 1976. Cyclomatic complexity shows the minimum number of required tests. The most effective way to reduce cyclomatic complexity is to decompose the code, split the methods into simpler ones, and also optimize logical expressions.
 
 Cyclomatic complexity increases by 1 for each of following constructions:
 
@@ -38,67 +38,28 @@ Cyclomatic complexity increases by 1 for each of following constructions:
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ```bsl
-Функция СерверныйМодульМенеджера(Имя)                                                   // 1
-	ОбъектНайден = Ложь;                                                                // 0
-                                                                                        // 0
-	ЧастиИмени = СтрРазделить(Имя, ".");                                                // 0
-	Если ЧастиИмени.Количество() = 2 Тогда                                              // 1
-                                                                                        // 0
-		ИмяВида = ВРег(ЧастиИмени[0]);                                                  // 0
-		ИмяОбъекта = ЧастиИмени[1];                                                     // 0
-                                                                                        // 0
-		Если ИмяВида = ВРег("Константы") Тогда                                          // 1
-			Если Метаданные.Константы.Найти(ИмяОбъекта) <> Неопределено Тогда           // 1
-				ОбъектНайден = Истина;                                                  // 0
-			КонецЕсли;                                                                  // 0
-		ИначеЕсли ИмяВида = ВРег("РегистрыСведений") Тогда                              // 1
-			Если Метаданные.РегистрыСведений.Найти(ИмяОбъекта) <> Неопределено Тогда    // 1
-				ОбъектНайден = Истина;                                                  // 0
-			КонецЕсли;                                                                  // 0
-		Иначе                                                                           // 1
-			ОбъектНайден = Ложь;                                                        // 0
-		КонецЕсли;                                                                      // 0
-	КонецЕсли;                                                                          // 0
-                                                                                        // 0
-	Если Не ОбъектНайден Тогда                                                          // 1
-		ВызватьИсключение СтроковыеФункцииКлиентСервер.ПодставитьПараметрыВСтроку(      // 0
-			НСтр("ru = 'Объект метаданных ""%1"" не найден,                             // 0
-			           |либо для него не поддерживается получение модуля менеджера.'"), // 0
-			Имя);                                                                       // 0
-	КонецЕсли;                                                                          // 0
-	УстановитьБезопасныйРежим(Истина);                                                  // 0
-	Модуль = Вычислить(Имя);                                                            // 0
-	F = ?(Условие, ИСТИНА, НЕОПРЕДЕЛЕНО);                                               // 1
-	А = ?(Условие, ИСТИНА, ?(Условие2, ЛОЖЬ, НЕОПРЕДЕЛЕНО));                            // 2
-	M = ИСТИНА ИЛИ 7;                                                                   // 1
-	Возврат Модуль;                                                                     // 0
-КонецФункции                                                                            // итог 12
+Функция СерверныйМодульМенеджера(Имя)                                                   // 1 	ОбъектНайден = Ложь;                                                                // 0                                                                                         // 0 	ЧастиИмени = СтрРазделить(Имя, ".");                                                // 0 	Если ЧастиИмени.Количество() = 2 Тогда                                              // 1                                                                                         // 0 		ИмяВида = ВРег(ЧастиИмени[0]);                                                  // 0 		ИмяОбъекта = ЧастиИмени[1];                                                     // 0                                                                                         // 0 		Если ИмяВида = ВРег("Константы") Тогда                                          // 1 			Если Метаданные.Константы.Найти(ИмяОбъекта) <> Неопределено Тогда           // 1 				ОбъектНайден = Истина;                                                  // 0 			КонецЕсли;                                                                  // 0 		ИначеЕсли ИмяВида = ВРег("РегистрыСведений") Тогда                              // 1 			Если Метаданные.РегистрыСведений.Найти(ИмяОбъекта) <> Неопределено Тогда    // 1 				ОбъектНайден = Истина;                                                  // 0 			КонецЕсли;                                                                  // 0 		Иначе                                                                           // 1 			ОбъектНайден = Ложь;                                                        // 0 		КонецЕсли;                                                                      // 0 	КонецЕсли;                                                                          // 0                                                                                         // 0 	Если Не ОбъектНайден Тогда                                                          // 1 		ВызватьИсключение СтроковыеФункцииКлиентСервер.ПодставитьПараметрыВСтроку(      // 0 			НСтр("ru = 'Объект метаданных ""%1"" не найден,                             // 0 			           |либо для него не поддерживается получение модуля менеджера.'"), // 0 			Имя);                                                                       // 0 	КонецЕсли;                                                                          // 0 	УстановитьБезопасныйРежим(Истина);                                                  // 0 	Модуль = Вычислить(Имя);                                                            // 0 	F = ?(Условие, ИСТИНА, НЕОПРЕДЕЛЕНО);                                               // 1 	А = ?(Условие, ИСТИНА, ?(Условие2, ЛОЖЬ, НЕОПРЕДЕЛЕНО));                            // 2 	M = ИСТИНА ИЛИ 7;                                                                   // 1 	Возврат Модуль;                                                                     // 0 КонецФункции                                                                            // итог 12
 ```
 
 ## Sources
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - [Cyclomatic Complexity PHP](https://pdepend.org/documentation/software-metrics/cyclomatic-complexity.html)
 - [Cyclomatic Complexity (RU)](https://ru.wikipedia.org/wiki/%D0%A6%D0%B8%D0%BA%D0%BB%D0%BE%D0%BC%D0%B0%D1%82%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F_%D1%81%D0%BB%D0%BE%D0%B6%D0%BD%D0%BE%D1%81%D1%82%D1%8C)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CyclomaticComplexity-off
-// BSLLS:CyclomaticComplexity-on
+// BSLLS:CyclomaticComplexity-off // BSLLS:CyclomaticComplexity-on
 ```
 
 ### Parameter for config
 
 ```json
-"CyclomaticComplexity": {
-    "complexityThreshold": 20,
-    "checkModuleBody": true
-}
+"CyclomaticComplexity": {     "complexityThreshold": 20,     "checkModuleBody": true }
 ```

From 74fd148d9cdec9ac5cdefd0952679cf002a1a199 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:10 +0000
Subject: [PATCH 382/444] Translate DiagnosticDevWorkFlow.md via GitLocalize


From a13ab30a2e2214a6544b2e075bb2f1afde6ea7a7 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:11 +0000
Subject: [PATCH 383/444] Translate DiagnosticTag.md via GitLocalize


From 63b0ad602abc5d72b786b8b0f2a2f6bc327ae3f4 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:12 +0000
Subject: [PATCH 384/444] Translate EnvironmentSetting.md via GitLocalize


From df610bffb34abb5855dc6ef957f62aa472ddc530 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:13 +0000
Subject: [PATCH 385/444] Translate FastStart.md via GitLocalize

---
 docs/en/contributing/FastStart.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/en/contributing/FastStart.md b/docs/en/contributing/FastStart.md
index 6fdab7905c0..e85fad9f30a 100644
--- a/docs/en/contributing/FastStart.md
+++ b/docs/en/contributing/FastStart.md
@@ -8,9 +8,9 @@ The following describes the steps to get started quickly.
 2. Clone the project repository to the created directory `https://github.com/1c-syntax/bsl-language-server.git`
 3. Set up the environment according to the [instructions](EnvironmentSetting.md)
 4. Execute commands to ignore changes in service files
-    1.  `git update-index --assume-unchanged ./.idea/compiler.xml` 
-    2.  `git update-index --assume-unchanged ./.idea/encodings.xml` 
-    3.  `git update-index --assume-unchanged ./.idea/misc.xml` 
+    1. `git update-index --assume-unchanged ./.idea/compiler.xml`
+    2. `git update-index --assume-unchanged ./.idea/encodings.xml`
+    3. `git update-index --assume-unchanged ./.idea/misc.xml`
 5. Open the `build.gradle.kts` file from the project directory, agree to import the dependencies, wait for them to download
 6. Run (from context menu or ide console) command `gradlew test`, if passed then all settings are correct
 7. Make yourself familiar with  [diagnostics development example](DiagnosticExample.md) , [structure and files purpose description,](DiagnosticStructure.md) and other articles in the [section for developers](index.md)
@@ -23,7 +23,14 @@ To analyze the AST tree when creating diagnostics, you may need to get a visual
 2. Clone the project repository into the created directory `https://github.com/1c-syntax/bsl-parser.git`
 3. Set up the environment according to the [instruction](EnvironmentSetting.md) *(if not previously performed)*
 4. Install `ANTLR v4 grammar plugin`
-5. Open the `build.gradle.kts` file from the project directory, agree to import the dependencies, wait for them to download
-6. Open `src/main/antlr/BSLParser.g4`
-7. Place the cursor on any line with a code *(not a comment)* and select the `Test Rule file` context menu item
-8. In the opened window, select a bsl-file or paste text from the clipboard
+
+- restart IDEA
+
+1. Set up the plugin -  `File | Settings | Languages & Frameworks | ANTLR v4 default project settings` `ANTLR v4 grammar plugin`
+
+- Set up `Case transformation in the Preview window` in `Transform to uppercase when lexing`
+
+1. Open the `build.gradle.kts` file from the project directory, agree to import the dependencies, wait for them to download
+2. Open `src/main/antlr/BSLParser.g4`
+3. Place the cursor on any line with a code *(not a comment)* and select the `Test Rule file` context menu item
+4. In the opened window, select a bsl-file or paste text from the clipboard

From 5274822d087c9d24809ccbc516ce8fc3ed6c3be9 Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:38:19 +0000
Subject: [PATCH 386/444] Translate index.md via GitLocalize

---
 docs/en/diagnostics/index.md | 234 +++++++++++++++++------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 627d965dc73..831046c6cc2 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -10,121 +10,121 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 Total: **111**
 
-* Error: **34**
-* Code smell: **70**
-* Vulnerability: **3**
-* Security Hotspot: **4**
+- Code smell: **70**
+- Vulnerability: **3**
+- Error: **34**
+- Security Hotspot: **4**
 
-| Key | Name| Enabled by default | Severity | Type | Tags |
-| --- | --- | :-: | --- | --- | --- |
-| [BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Violating transaction rules for the 'BeginTransaction' method | Yes | Major | Error | `standard` |
-| [CachedPublic](CachedPublic.md) | Cached public methods | Yes | Major | Code smell | `standard`<br/>`design` |
-| [CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Canonical keyword writing | Yes | Info | Code smell | `standard` |
-| [CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Method definitions must be placed before the module body operators | Yes | Blocker | Error | `error` |
-| [CodeOutOfRegion](CodeOutOfRegion.md) | Code out of region | Yes | Info | Code smell | `standard` |
-| [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
-| [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
-| [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
-| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
-| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br/>`unpredictable`<br/>`design` |
-| [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
-| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
-| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [CommonModuleNameWords](CommonModuleNameWords.md) | Unrecommended common module name | Yes | Info | Code smell | `standard` |
-| [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
-| [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
-| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
-| [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
-| [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
-| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
-| [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
-| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated` |
-| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
-| [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
-| [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [DeprecatedMethodCall](DeprecatedMethodCall.md) | Deprecated methods should not be used | Yes | Minor | Code smell | `deprecated`<br/>`design` |
-| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
-| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated` |
-| [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
-| [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
-| [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
-| [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
-| [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
-| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [ExecuteExternalCode](ExecuteExternalCode.md) | Executing of external code on the server | Yes | Critical | Vulnerability | `error`<br/>`standard` |
-| [ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Executing of external code in a common module on the server | Yes | Critical | Security Hotspot | `badpractice`<br/>`standard` |
-| [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
-| [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
-| [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
-| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br/>`badpractice` |
-| [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br/>`unpredictable` |
-| [GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error` |
-| [IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious` |
-| [IfConditionComplexity](IfConditionComplexity.md) | Usage of complex expressions in the "If" condition | Yes | Minor | Code smell | `brainoverload` |
-| [IfElseDuplicatedCodeBlock](IfElseDuplicatedCodeBlock.md) | Duplicated code blocks in If...Then...ElseIf... statements | Yes | Minor | Code smell | `suspicious` |
-| [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious` |
-| [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice` |
-| [InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br/>`standard`<br/>`unpredictable` |
-| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error` |
-| [LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
-| [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` |
-| [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`<br/>`badpractice` |
-| [MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice` |
-| [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br/>`standard` |
-| [MissingVariablesDescription](MissingVariablesDescription.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard` |
-| [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br/>`localize` |
-| [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br/>`localize` |
-| [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br/>`brainoverload` |
-| [NestedFunctionInParameters](NestedFunctionInParameters.md) | Initialization of method and constructor parameters by calling nested methods | Yes | Minor | Code smell | `standard`<br/>`brainoverload`<br/>`badpractice` |
-| [NestedStatements](NestedStatements.md) | Control flow statements should not be nested too deep | Yes | Critical | Code smell | `badpractice`<br/>`brainoverload` |
-| [NestedTernaryOperator](NestedTernaryOperator.md) | Nested ternary operator | Yes | Major | Code smell | `brainoverload` |
-| [NonExportMethodsInApiRegion](NonExportMethodsInApiRegion.md) | Non export methods in API regions | Yes | Major | Code smell | `standard` |
-| [NonStandardRegion](NonStandardRegion.md) | Non-standard region of module | Yes | Info | Code smell | `standard` |
-| [NumberOfOptionalParams](NumberOfOptionalParams.md) | Limit number of optional parameters in method | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
-| [NumberOfParams](NumberOfParams.md) | Number of parameters in method | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
-| [NumberOfValuesInStructureConstructor](NumberOfValuesInStructureConstructor.md) | Limit on the number of property values passed to the structure constructor | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
-| [OSUsersMethod](OSUsersMethod.md) | Using method OSUsers | Yes | Critical | Security Hotspot | `suspicious` |
-| [OneStatementPerLine](OneStatementPerLine.md) | One statement per line | Yes | Minor | Code smell | `standard`<br/>`design` |
-| [OrderOfParams](OrderOfParams.md) | Order of Parameters in method | Yes | Major | Code smell | `standard`<br/>`design` |
-| [PairingBrokenTransaction](PairingBrokenTransaction.md) | Violation of pairing using methods "BeginTransaction()" & "CommitTransaction()" / "RollbackTransaction()" | Yes | Major | Error | `standard` |
-| [ParseError](ParseError.md) | Source code parse error | Yes | Critical | Error | `error` |
-| [ProcedureReturnsValue](ProcedureReturnsValue.md) | Procedure should not return Value | Yes | Blocker | Error | `error` |
-| [PublicMethodsDescription](PublicMethodsDescription.md) | All public methods must have a description | Yes | Info | Code smell | `standard`<br/>`brainoverload`<br/>`badpractice` |
-| [SelfAssign](SelfAssign.md) | Variable is assigned to itself | Yes | Major | Error | `suspicious` |
-| [SelfInsertion](SelfInsertion.md) | Insert a collection into itself | Yes | Major | Error | `standard`<br/>`unpredictable`<br/>`performance` |
-| [SemicolonPresence](SemicolonPresence.md) | Statement should end with semicolon symbol ";" | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
-| [SeveralCompilerDirectives](SeveralCompilerDirectives.md) | Erroneous indication of several compilation directives | Yes | Critical | Error | `unpredictable`<br/>`error` |
-| [SpaceAtStartComment](SpaceAtStartComment.md) | Space at the beginning of the comment | Yes | Info | Code smell | `standard` |
-| [TempFilesDir](TempFilesDir.md) | TempFilesDir() method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
-| [TernaryOperatorUsage](TernaryOperatorUsage.md) | Ternary operator usage | No | Minor | Code smell | `brainoverload` |
-| [ThisObjectAssign](ThisObjectAssign.md) | ThisObject assign | Yes | Blocker | Error | `error` |
-| [TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Timeouts working with external resources | Yes | Critical | Error | `unpredictable`<br/>`standard` |
-| [TooManyReturns](TooManyReturns.md) | Methods should not have too many return statements | No | Minor | Code smell | `brainoverload` |
-| [TryNumber](TryNumber.md) | Cast to number of try catch block | Yes | Major | Code smell | `standard` |
-| [Typo](Typo.md) | Typo | Yes | Info | Code smell | `badpractice` |
-| [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br/>`brainoverload` |
-| [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br/>`error` |
-| [UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br/>`suspicious` |
-| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `deprecated`<br/>`error` |
-| [UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br/>`suspicious` |
-| [UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design` |
-| [UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy` |
-| [UsingCancelParameter](UsingCancelParameter.md) | Using parameter "Cancel" | Yes | Major | Code smell | `standard`<br/>`badpractice` |
-| [UsingExternalCodeTools](UsingExternalCodeTools.md) | Using external code tools | Yes | Critical | Security Hotspot | `standard`<br/>`design` |
-| [UsingFindElementByString](UsingFindElementByString.md) | Using FindByName and FindByCode | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`performance` |
-| [UsingGoto](UsingGoto.md) | "goto" statement should not be used | Yes | Critical | Code smell | `standard`<br/>`badpractice` |
-| [UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Using hardcode ip addresses in code | Yes | Critical | Vulnerability | `standard` |
-| [UsingHardcodePath](UsingHardcodePath.md) | Using hardcode file paths in code | Yes | Critical | Error | `standard` |
-| [UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Storing confidential information in code | Yes | Critical | Vulnerability | `standard` |
-| [UsingModalWindows](UsingModalWindows.md) | Using modal windows | Yes | Major | Code smell | `standard` |
-| [UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Using unavailable in Unix objects | Yes | Critical | Error | `standard`<br/>`lockinos` |
-| [UsingServiceTag](UsingServiceTag.md) | Using service tags | Yes | Info | Code smell | `badpractice` |
-| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | Yes | Major | Code smell | `standard` |
-| [UsingThisForm](UsingThisForm.md) | Using deprecated property "ThisForm" | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
-| [WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Not recommended using of RollbackTransaction method | Yes | Critical | Error | `standard` |
-| [YoLetterUsage](YoLetterUsage.md) | Using Russian character "yo" ("ё") in code | Yes | Info | Code smell | `standard` |
\ No newline at end of file
+Key | Name | Enabled by default | Severity | Type | Tags
+--- | --- | :-: | --- | --- | ---
+[BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Violating transaction rules for the 'BeginTransaction' method | Yes | Major | Error | `standard`
+[CachedPublic](CachedPublic.md) | Cached public methods | Yes | Major | Code smell | `standard`<br>`design`
+[CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Canonical keyword writing | Yes | Info | Code smell | `standard`
+[CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Method definitions must be placed before the module body operators | Yes | Blocker | Error | `error`
+[CodeOutOfRegion](CodeOutOfRegion.md) | Code out of region | Yes | Info | Code smell | `standard`
+[CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload`
+[CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br>`badpractice`
+[CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard`
+[CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error`
+[CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br>`unpredictable`<br>`design`
+[CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
+[CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
+[CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
+[CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br>`badpractice`<br>`unpredictable`
+[CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`brainoverload`
+[CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard`
+[CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
+[CommonModuleNameWords](CommonModuleNameWords.md) | Unrecommended common module name | Yes | Info | Code smell | `standard`
+[CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br>`unpredictable`
+[CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br>`standard`<br>`unpredictable`
+[ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice`
+[CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance`
+[CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload`
+[DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br>`badpractice`<br>`unpredictable`
+[DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br>`error`
+[DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated`
+[DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br>`deprecated`<br>`unpredictable`
+[DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated`
+[DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br>`deprecated`
+[DeprecatedMethodCall](DeprecatedMethodCall.md) | Deprecated methods should not be used | Yes | Minor | Code smell | `deprecated`<br>`design`
+[DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated`
+[DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated`
+[DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br>`deprecated`
+[DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard`
+[EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br>`suspicious`
+[EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard`
+[EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice`
+[ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br>`deprecated`
+[ExecuteExternalCode](ExecuteExternalCode.md) | Executing of external code on the server | Yes | Critical | Vulnerability | `error`<br>`standard`
+[ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Executing of external code in a common module on the server | Yes | Critical | Security Hotspot | `badpractice`<br>`standard`
+[ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br>`badpractice`
+[FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice`
+[FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard`
+[FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br>`badpractice`
+[FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br>`unpredictable`
+[GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error`
+[IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious`
+[IfConditionComplexity](IfConditionComplexity.md) | Usage of complex expressions in the "If" condition | Yes | Minor | Code smell | `brainoverload`
+[IfElseDuplicatedCodeBlock](IfElseDuplicatedCodeBlock.md) | Duplicated code blocks in If...Then...ElseIf... statements | Yes | Minor | Code smell | `suspicious`
+[IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious`
+[IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice`
+[InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br>`standard`<br>`unpredictable`
+[IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error`
+[LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br>`badpractice`
+[MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice`
+[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`<br>`badpractice`
+[MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice`
+[MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br>`standard`
+[MissingVariablesDescription](MissingVariablesDescription.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard`
+[MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br>`localize`
+[MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br>`localize`
+[NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br>`brainoverload`
+[NestedFunctionInParameters](NestedFunctionInParameters.md) | Initialization of method and constructor parameters by calling nested methods | Yes | Minor | Code smell | `standard`<br>`brainoverload`<br>`badpractice`
+[NestedStatements](NestedStatements.md) | Control flow statements should not be nested too deep | Yes | Critical | Code smell | `badpractice`<br>`brainoverload`
+[NestedTernaryOperator](NestedTernaryOperator.md) | Nested ternary operator | Yes | Major | Code smell | `brainoverload`
+[NonExportMethodsInApiRegion](NonExportMethodsInApiRegion.md) | Non export methods in API regions | Yes | Major | Code smell | `standard`
+[NonStandardRegion](NonStandardRegion.md) | Non-standard region of module | Yes | Info | Code smell | `standard`
+[NumberOfOptionalParams](NumberOfOptionalParams.md) | Limit number of optional parameters in method | Yes | Minor | Code smell | `standard`<br>`brainoverload`
+[NumberOfParams](NumberOfParams.md) | Number of parameters in method | Yes | Minor | Code smell | `standard`<br>`brainoverload`
+[NumberOfValuesInStructureConstructor](NumberOfValuesInStructureConstructor.md) | Limit on the number of property values passed to the structure constructor | Yes | Minor | Code smell | `standard`<br>`brainoverload`
+[OSUsersMethod](OSUsersMethod.md) | Using method OSUsers | Yes | Critical | Security Hotspot | `suspicious`
+[OneStatementPerLine](OneStatementPerLine.md) | One statement per line | Yes | Minor | Code smell | `standard`<br>`design`
+[OrderOfParams](OrderOfParams.md) | Order of Parameters in method | Yes | Major | Code smell | `standard`<br>`design`
+[PairingBrokenTransaction](PairingBrokenTransaction.md) | Violation of pairing using methods "BeginTransaction()" & "CommitTransaction()" / "RollbackTransaction()" | Yes | Major | Error | `standard`
+[ParseError](ParseError.md) | Source code parse error | Yes | Critical | Error | `error`
+[ProcedureReturnsValue](ProcedureReturnsValue.md) | Procedure should not return Value | Yes | Blocker | Error | `error`
+[PublicMethodsDescription](PublicMethodsDescription.md) | All public methods must have a description | Yes | Info | Code smell | `standard`<br>`brainoverload`<br>`badpractice`
+[SelfAssign](SelfAssign.md) | Variable is assigned to itself | Yes | Major | Error | `suspicious`
+[SelfInsertion](SelfInsertion.md) | Insert a collection into itself | Yes | Major | Error | `standard`<br>`unpredictable`<br>`performance`
+[SemicolonPresence](SemicolonPresence.md) | Statement should end with semicolon symbol ";" | Yes | Minor | Code smell | `standard`<br>`badpractice`
+[SeveralCompilerDirectives](SeveralCompilerDirectives.md) | Erroneous indication of several compilation directives | Yes | Critical | Error | `unpredictable`<br>`error`
+[SpaceAtStartComment](SpaceAtStartComment.md) | Space at the beginning of the comment | Yes | Info | Code smell | `standard`
+[TempFilesDir](TempFilesDir.md) | TempFilesDir() method call | Yes | Major | Code smell | `standard`<br>`badpractice`
+[TernaryOperatorUsage](TernaryOperatorUsage.md) | Ternary operator usage | No | Minor | Code smell | `brainoverload`
+[ThisObjectAssign](ThisObjectAssign.md) | ThisObject assign | Yes | Blocker | Error | `error`
+[TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Timeouts working with external resources | Yes | Critical | Error | `unpredictable`<br>`standard`
+[TooManyReturns](TooManyReturns.md) | Methods should not have too many return statements | No | Minor | Code smell | `brainoverload`
+[TryNumber](TryNumber.md) | Cast to number of try catch block | Yes | Major | Code smell | `standard`
+[Typo](Typo.md) | Typo | Yes | Info | Code smell | `badpractice`
+[UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br>`brainoverload`
+[UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br>`error`
+[UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br>`suspicious`
+[UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `deprecated`<br>`error`
+[UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br>`suspicious`
+[UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design`
+[UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy`
+[UsingCancelParameter](UsingCancelParameter.md) | Using parameter "Cancel" | Yes | Major | Code smell | `standard`<br>`badpractice`
+[UsingExternalCodeTools](UsingExternalCodeTools.md) | Using external code tools | Yes | Critical | Security Hotspot | `standard`<br>`design`
+[UsingFindElementByString](UsingFindElementByString.md) | Using FindByName and FindByCode | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`performance`
+[UsingGoto](UsingGoto.md) | "goto" statement should not be used | Yes | Critical | Code smell | `standard`<br>`badpractice`
+[UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Using hardcode ip addresses in code | Yes | Critical | Vulnerability | `standard`
+[UsingHardcodePath](UsingHardcodePath.md) | Using hardcode file paths in code | Yes | Critical | Error | `standard`
+[UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Storing confidential information in code | Yes | Critical | Vulnerability | `standard`
+[UsingModalWindows](UsingModalWindows.md) | Using modal windows | Yes | Major | Code smell | `standard`
+[UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Using unavailable in Unix objects | Yes | Critical | Error | `standard`<br>`lockinos`
+[UsingServiceTag](UsingServiceTag.md) | Using service tags | Yes | Info | Code smell | `badpractice`
+[UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | Yes | Major | Code smell | `standard`
+[UsingThisForm](UsingThisForm.md) | Using deprecated property "ThisForm" | Yes | Minor | Code smell | `standard`<br>`deprecated`
+[WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Not recommended using of RollbackTransaction method | Yes | Critical | Error | `standard`
+[YoLetterUsage](YoLetterUsage.md) | Using Russian character "yo" ("ё") in code | Yes | Info | Code smell | `standard`

From 12195042ae6bbaa21eecbd37a7fecdda2f810f13 Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:20 +0000
Subject: [PATCH 387/444] Translate CodeOutOfRegion.md via GitLocalize

---
 docs/en/diagnostics/CodeOutOfRegion.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/CodeOutOfRegion.md b/docs/en/diagnostics/CodeOutOfRegion.md
index 56328b465fb..226cc579200 100644
--- a/docs/en/diagnostics/CodeOutOfRegion.md
+++ b/docs/en/diagnostics/CodeOutOfRegion.md
@@ -1,10 +1,11 @@
 # Code out of region (CodeOutOfRegion)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -20,18 +21,16 @@ The code of module should be structured and divided into regions.
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CodeOutOfRegion-off
-// BSLLS:CodeOutOfRegion-on
+// BSLLS:CodeOutOfRegion-off // BSLLS:CodeOutOfRegion-on
 ```
 
 ### Parameter for config

From 49f7c7b1f1626509c0ca8b1e24481abb99c9c51f Mon Sep 17 00:00:00 2001
From: Eduard Ivanov <skikaha@yandex.ru>
Date: Fri, 22 May 2020 13:38:22 +0000
Subject: [PATCH 388/444] Translate CommentedCode.md via GitLocalize

---
 docs/en/diagnostics/CommentedCode.md | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/docs/en/diagnostics/CommentedCode.md b/docs/en/diagnostics/CommentedCode.md
index e2873dede77..b7fad278551 100644
--- a/docs/en/diagnostics/CommentedCode.md
+++ b/docs/en/diagnostics/CommentedCode.md
@@ -1,21 +1,20 @@
 # Commented out code (CommentedCode)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`badpractice`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `threshold` | `Float` | ```Threshold``` | ```0.9``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`threshold` | `Float` | `Threshold` | `0.9`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
-Software modules should not have commented out code fragments, as well as fragments,
-which are in any way connected with the development process (debugging code, service marks, i.e. !!! _, MRG, etc.)
-and with specific developers of this code.
+Software modules should not have commented out code fragments, as well as fragments, which are in any way connected with the development process (debugging code, service marks, i.e. !!! _, MRG, etc.) and with specific developers of this code.
 
 For example, it is unacceptable to leave such fragments in the code after debugging or refactoring is completed:
 
@@ -40,8 +39,7 @@ EndProcedure
 Correct: after debugging or refactoring is completed, remove the handler BeforeDelete from the code.
 
 **ATTENTION** :
-
-A code block is considered commented , if at least one line inside the block is defined as code.
+ A code block is considered commented , if at least one line inside the block is defined as code.
 
 ## Sources
 
@@ -50,6 +48,7 @@ A code block is considered commented , if at least one line inside the block is
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From eab67ae61e79825ef64376d3b954f94f4a18a304 Mon Sep 17 00:00:00 2001
From: mt-gitlocalize <mt@gitlocalize.com>
Date: Fri, 22 May 2020 13:38:23 +0000
Subject: [PATCH 389/444] Translate ConsecutiveEmptyLines.md via GitLocalize

---
 docs/en/diagnostics/ConsecutiveEmptyLines.md | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/ConsecutiveEmptyLines.md b/docs/en/diagnostics/ConsecutiveEmptyLines.md
index 7cfb5033d72..91bf3ee3255 100644
--- a/docs/en/diagnostics/ConsecutiveEmptyLines.md
+++ b/docs/en/diagnostics/ConsecutiveEmptyLines.md
@@ -1,22 +1,29 @@
 # Consecutive empty lines (ConsecutiveEmptyLines)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Info` | `Yes` | `1` | `badpractice`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `allowedEmptyLinesCount` | `Integer` | ```Maximum allowed consecutive empty lines``` | ```1``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`allowedEmptyLinesCount` | `Integer` | `Maximum allowed consecutive empty lines` | `1`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+To separate blocks of code among themselves, insert an empty line.
+
+Inserting 2 or more empty lines does not carry this value and leads to a meaningless increase in the length of the method or module.
+
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 3d1b84262c8eba1005afaa7e2fe7eebf7302f2f8 Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:38:24 +0000
Subject: [PATCH 390/444] Translate ConsecutiveEmptyLines.md via GitLocalize

---
 docs/en/diagnostics/ConsecutiveEmptyLines.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/ConsecutiveEmptyLines.md b/docs/en/diagnostics/ConsecutiveEmptyLines.md
index 91bf3ee3255..b3e8bcc5041 100644
--- a/docs/en/diagnostics/ConsecutiveEmptyLines.md
+++ b/docs/en/diagnostics/ConsecutiveEmptyLines.md
@@ -27,14 +27,11 @@ Inserting 2 or more empty lines does not carry this value and leads to a meaning
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ConsecutiveEmptyLines-off
-// BSLLS:ConsecutiveEmptyLines-on
+// BSLLS:ConsecutiveEmptyLines-off // BSLLS:ConsecutiveEmptyLines-on
 ```
 
 ### Parameter for config
 
 ```json
-"ConsecutiveEmptyLines": {
-    "allowedEmptyLinesCount": 1
-}
+"ConsecutiveEmptyLines": {     "allowedEmptyLinesCount": 1 }
 ```

From 7c39809c5afaa640b5311141ea71715b57cf1ac7 Mon Sep 17 00:00:00 2001
From: mt-gitlocalize <mt@gitlocalize.com>
Date: Fri, 22 May 2020 13:38:26 +0000
Subject: [PATCH 391/444] Translate CachedPublic.md via GitLocalize

---
 docs/en/diagnostics/CachedPublic.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/en/diagnostics/CachedPublic.md b/docs/en/diagnostics/CachedPublic.md
index 8a5ebb7b365..8c3d2758e67 100644
--- a/docs/en/diagnostics/CachedPublic.md
+++ b/docs/en/diagnostics/CachedPublic.md
@@ -1,28 +1,35 @@
 # Cached public methods (CachedPublic)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`design` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`design`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+You should not create a programming interface in modules that reuse return values.
+
+3.6. Another example of hiding library implementation details from a consumer. Suppose: in the first version of the library, consumers were provided with an export function of a common module with repeated use of return values; But in the next version of the library, this design decision was revised in favor of the “usual” general module, where this function was transferred (similarly, if in the opposite direction). In this example, in order to save the library user from additional efforts to replace calls of the "old" function with a new one, it is recommended to immediately place the export function in the "regular" module, in its section "program interface". Then this function, depending on the current design decision, can call the utility function from the module with repeated use of the returned values or from any other module, or directly contain the implementation. However, for the consumer, its location will no longer change in future versions of the library.
 
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+- Source: [Standard: Ensuring Library Compatibility](https://its.1c.ru/db/v8std#content:644:hdoc:3.6)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CachedPublic-off
-// BSLLS:CachedPublic-on
+// BSLLS:CachedPublic-off // BSLLS:CachedPublic-on
 ```
 
 ### Parameter for config

From 44dc4007654d9a593de68c57e58d2a252fc08817 Mon Sep 17 00:00:00 2001
From: Dima Ovcharenko <d.ovcharenko90@gmail.com>
Date: Fri, 22 May 2020 13:38:27 +0000
Subject: [PATCH 392/444] Translate DeprecatedTypeManagedForm.md via
 GitLocalize

---
 docs/en/diagnostics/DeprecatedTypeManagedForm.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedTypeManagedForm.md b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
index 76ff26474c6..f847c828482 100644
--- a/docs/en/diagnostics/DeprecatedTypeManagedForm.md
+++ b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
@@ -1,10 +1,11 @@
-# Deprecated ManagedForm type (DeprecatedTypeManagedForm)
+# Using deprecated type "ManagedForm" (DeprecatedTypeManagedForm)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`<br/>`deprecated` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`<br>`deprecated`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -15,18 +16,16 @@ Starting from the platform version 8.3.14, the "ManagedForm" type has been renam
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - Source: [Changelog](https://dl03.1c.ru/content/Platform/8_3_16_1148/1cv8upd_8_3_16_1148.htm)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedTypeManagedForm-off
-// BSLLS:DeprecatedTypeManagedForm-on
+// BSLLS:DeprecatedTypeManagedForm-off // BSLLS:DeprecatedTypeManagedForm-on
 ```
 
 ### Parameter for config

From 56e6bdbdeca499cc4689cb9097af25ede14fdcb2 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:28 +0000
Subject: [PATCH 393/444] Translate CommonModuleNameClientServer.md via
 GitLocalize

---
 .../CommonModuleNameClientServer.md           | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
index aee9002cde0..31adbc2d81a 100644
--- a/docs/en/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -1,28 +1,44 @@
 # Missed postfix "ClientServer" (CommonModuleNameClientServer)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
+To avoid code duplication, it is recommended to create client-server common modules with methods whose contents are the same on the server and on the client. These modules have signs:
+
+- Client (Managed application)
+- Server (ServerCall is disabled)
+- Client (Ordinary application)
+- External connection
+
+Common modules of this type are named with the "ClientServer" postfix
+
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
+FilesClientServer, CommonClientServer, UsersClientServer
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Standard: Rules for creating common modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:2.4)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameClientServer-off
-// BSLLS:CommonModuleNameClientServer-on
+// BSLLS:CommonModuleNameClientServer-off // BSLLS:CommonModuleNameClientServer-on
 ```
 
 ### Parameter for config

From 37e662cbaf36e1691ed00f471566fa11befb0223 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:30 +0000
Subject: [PATCH 394/444] Translate CommonModuleNameWords.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleNameWords.md | 29 ++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
index 073ebddf612..2423c0a64af 100644
--- a/docs/en/diagnostics/CommonModuleNameWords.md
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -1,40 +1,41 @@
 # Unrecommended common module name (CommonModuleNameWords)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `5` | `standard`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `words` | `String` | ```Unrecommended words``` | ```процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`words` | `String` | `Unrecommended words` | ```процедуры
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
-<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
+It is not recommended to use the words "Procedures", "Functions", "Handlers", "Module", "Functionality" in the name of the general module
 
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ## Sources
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+- [Standard: Rules for creating common modules (RU)](https://its.1c.ru/db/v8std#content:469:hdoc:3.1)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameWords-off
-// BSLLS:CommonModuleNameWords-on
+// BSLLS:CommonModuleNameWords-off // BSLLS:CommonModuleNameWords-on
 ```
 
 ### Parameter for config
 
 ```json
-"CommonModuleNameWords": {
-    "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality"
-}
+"CommonModuleNameWords": {     "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality" }
 ```

From 72c2157d4842097bc007221c34562711af80207e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:32 +0000
Subject: [PATCH 395/444] Translate MissingSpace.md via GitLocalize

---
 docs/en/diagnostics/MissingSpace.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/en/diagnostics/MissingSpace.md b/docs/en/diagnostics/MissingSpace.md
index 7dd60cccfca..fe5a0ced9b0 100644
--- a/docs/en/diagnostics/MissingSpace.md
+++ b/docs/en/diagnostics/MissingSpace.md
@@ -1,24 +1,24 @@
 # Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; (MissingSpace)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Info` | `Yes` | `1` | `badpractice`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `checkSpaceToRightOfUnary` | `Boolean` | ```Check for space to the right of unary signs (+ -)``` | ```false``` |
-| `listForCheckRight` | `String` | ```List of symbols to check for the space to the right of (separated by space)``` | ```, ;``` |
-| `listForCheckLeft` | `String` | ```List of symbols to check for the space to the left of (separated by space)``` | `````` |
-| `allowMultipleCommas` | `Boolean` | ```Allow several commas in a row``` | ```false``` |
-| `listForCheckLeftAndRight` | `String` | ```List of symbols to check for the space from both sides of (separated by space)``` | ```+ - * / = % < > <> <= >=``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`checkSpaceToRightOfUnary` | `Boolean` | `Check for space to the right of unary signs (+ -)` | `false`
+`listForCheckRight` | `String` | `List of symbols to check for the space to the right of (separated by space)` | `, ;`
+`listForCheckLeft` | `String` | `List of symbols to check for the space to the left of (separated by space)` | ``````
+`allowMultipleCommas` | `Boolean` | `Allow several commas in a row` | `false`
+`listForCheckLeftAndRight` | `String` | `List of symbols to check for the space from both sides of (separated by space)` | `+ - * / = % < > <> <= >=`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
-To improve code readability to the left and right of operators `+ - * / = % < > <> <= >=` there must be spaces.
-Also, the space should be to the right of `,` и `;`
+To improve code readability to the left and right of operators `+ - * / = % < > <> <= >=` there must be spaces. Also, the space should be to the right of `,` и `;`
 
 ## Examples
 
@@ -81,6 +81,7 @@ CommonModuleClientServer.MessageToUser(MessageText, , , , Cancel);     // Correc
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From eb4be2608f6f08c826852e0ad8abacf3418f8589 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:33 +0000
Subject: [PATCH 396/444] Translate NestedStatements.md via GitLocalize

---
 docs/en/diagnostics/NestedStatements.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/NestedStatements.md b/docs/en/diagnostics/NestedStatements.md
index adb61af3736..10c950a8e4f 100644
--- a/docs/en/diagnostics/NestedStatements.md
+++ b/docs/en/diagnostics/NestedStatements.md
@@ -1,16 +1,17 @@
 # Control flow statements should not be nested too deep (NestedStatements)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `30` | `badpractice`<br/>`brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `30` | `badpractice`<br>`brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxAllowedLevel` | `Integer` | ```Max nested level``` | ```4``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxAllowedLevel` | `Integer` | `Max nested level` | `4`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 Nested operators "If", "For", "ForEach", "While" and "Try" are key ingredients for so called "spaghetti-code".
@@ -47,6 +48,7 @@ EndIf;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 7d0520df2fe681f376fa49d0751ea6fc0526f6bf Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:34 +0000
Subject: [PATCH 397/444] Translate LineLength.md via GitLocalize

---
 docs/en/diagnostics/LineLength.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/LineLength.md b/docs/en/diagnostics/LineLength.md
index f5066652b35..efcafce186d 100644
--- a/docs/en/diagnostics/LineLength.md
+++ b/docs/en/diagnostics/LineLength.md
@@ -1,16 +1,17 @@
 # Line Length limit (LineLength)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`badpractice`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxLineLength` | `Integer` | ```Max length of string in characters``` | ```120``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxLineLength` | `Integer` | `Max length of string in characters` | `120`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 If the line length is grater than 120 characters you should you line break. It is not recommended to have lines longer than 120 characters, except when line break is impossible (example, in code we have a string constant which is displayed without line breaks in message window using object MessageToUser).
@@ -22,6 +23,7 @@ If the line length is grater than 120 characters you should you line break. It i
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From ae98254de62229dc93625ef12ea88436c1ff1d15 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:36 +0000
Subject: [PATCH 398/444] Translate UnsafeSafeModeMethodCall.md via GitLocalize

---
 .../diagnostics/UnsafeSafeModeMethodCall.md   | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
index 770a9adde88..b4a93a6a7e4 100644
--- a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -1,48 +1,51 @@
 # Unsafe SafeMode method call (UnsafeSafeModeMethodCall)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `deprecated`<br/>`error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL` | `Blocker` | `Yes` | `1` | `deprecated`<br>`error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-In "1C: Enterprise 8.3" the global context method SafeMode () returns the type String,
-if safe mode was set with the name of the security profile.
 
-Using the Safe Mode () method,
- in which the result is implicitly converted to a Boolean type is unsafe,
- must be corrected for the code with an explicit comparison of the result with the value False.
- Thus, with the installed security profile, the code will be executed in the same way as in the safe mode.
+In "1C: Enterprise 8.3" the global context method SafeMode () returns the type String, if safe mode was set with the name of the security profile.
+
+Using the Safe Mode () method, in which the result is implicitly converted to a Boolean type is unsafe, must be corrected for the code with an explicit comparison of the result with the value False. Thus, with the installed security profile, the code will be executed in the same way as in the safe mode.
 
-Use SafeMode() <> False
 ## Examples
+
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
-Incorrect:
+
+Wrong:
+
 ```
-If SafeMode() Then
-// some code
-EndIf;
+If SafeMode() Then // some code EndIf;
 ```
+
 Correct:
+
 ```
-If SafeMode() = True Then
+If SafeMode() <> False Then
 // some code
 EndIf;
 ```
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-Source: [SafeMode method](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
+- Source: [SafeMode method](https://its.1c.ru/db/metod8dev#content:5293:hdoc:izmenenie_bezopasnyjrezhim)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:UnsafeSafeModeMethodCall-off
-// BSLLS:UnsafeSafeModeMethodCall-on
+// BSLLS:UnsafeSafeModeMethodCall-off // BSLLS:UnsafeSafeModeMethodCall-on
 ```
 
 ### Parameter for config

From 41bdc6d2ec3262404561ecaed3feadc6ff9389f9 Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:37 +0000
Subject: [PATCH 399/444] Translate UsingHardcodeSecretInformation.md via
 GitLocalize

---
 .../UsingHardcodeSecretInformation.md            | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/UsingHardcodeSecretInformation.md b/docs/en/diagnostics/UsingHardcodeSecretInformation.md
index 53ddc7cd79b..fa698407dd3 100644
--- a/docs/en/diagnostics/UsingHardcodeSecretInformation.md
+++ b/docs/en/diagnostics/UsingHardcodeSecretInformation.md
@@ -1,16 +1,17 @@
 # Storing confidential information in code (UsingHardcodeSecretInformation)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Vulnerability` | `BSL` | `Critical` | `Yes` | `15` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Vulnerability` | `BSL` | `Critical` | `Yes` | `15` | `standard`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `searchWords` | `String` | ```Search keywords for confidential information in variables, structures, mappings.``` | ```Пароль|Password``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`searchWords` | `String` | `Search keywords for confidential information in variables. structures, mappings.` | ```Пароль
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 It is prohibited to store any confidential information in the code. The confidential information is:
@@ -50,6 +51,7 @@ Password = Passwords.Password;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 1e7ab3c3dc5f1f9d7a737592760d6020d26f8dd1 Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:38:39 +0000
Subject: [PATCH 400/444] Translate UsingGoto.md via GitLocalize

---
 docs/en/diagnostics/UsingGoto.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/diagnostics/UsingGoto.md b/docs/en/diagnostics/UsingGoto.md
index 2b822c51449..cc8f581a76e 100644
--- a/docs/en/diagnostics/UsingGoto.md
+++ b/docs/en/diagnostics/UsingGoto.md
@@ -1,16 +1,15 @@
 # "goto" statement should not be used (UsingGoto)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `5` | `standard`<br/>`badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `5` | `standard`<br>`badpractice`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 `goto` is an unstructured control flow statement. It makes code less readable and maintainable.
-
-Structured control flow statements such as `if`, `for`, `while`, `continue` or `break`
-should be used instead.
+ Structured control flow statements such as `if`, `for`, `while`, `continue` or `break` should be used instead.
 
 ## Examples
 
@@ -41,6 +40,7 @@ EndDo;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From d248445d925499919bceedb91f24a5a827d657c4 Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:40 +0000
Subject: [PATCH 401/444] Translate UsingCancelParameter.md via GitLocalize

---
 docs/en/diagnostics/UsingCancelParameter.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/en/diagnostics/UsingCancelParameter.md b/docs/en/diagnostics/UsingCancelParameter.md
index 106d2d45f1a..2c1221a6a11 100644
--- a/docs/en/diagnostics/UsingCancelParameter.md
+++ b/docs/en/diagnostics/UsingCancelParameter.md
@@ -1,17 +1,14 @@
 # Using parameter "Cancel" (UsingCancelParameter)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Major` | `Yes` | `10` | `standard`<br/>`badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Major` | `Yes` | `10` | `standard`<br>`badpractice`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-## Description
-
-In event handlers of object's modules, record sets, forms and etc. using parameter "Cancel" (ПриЗаписи, ОбработкаПроверкиЗаполнения, ТоварыПередНачаломДобавления and etc.) it should not be assigned value "false".
 
-This is due to the fact, that in code of event handlers the parameter "Cancel" can be set in several consecutive checks (or in several subscriptions on the same event).In this case, by the time the next check is performed, the parameter "Cancel" can already be set to True, and you can set it to False by mistake.
+## Description
 
-In addition when modifying configuration the number of such checks can increase.
+In event handlers of object's modules, record sets, forms and etc. using parameter "Cancel" (ПриЗаписи, ОбработкаПроверкиЗаполнения, ТоварыПередНачаломДобавления and etc.) it should not be assigned value "false".  This is due to the fact, that in code of event handlers the parameter "Cancel" can be set in several consecutive checks (or in several subscriptions on the same event).In this case, by the time the next check is performed, the parameter "Cancel" can already be set to True, and you can set it to False by mistake.  In addition when modifying configuration the number of such checks can increase.
 
 ## Examples
 
@@ -50,6 +47,7 @@ Cancel = Cancel Или ЕстьОшибкиЗаполнения();
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From d5a4f835ac27856c9a62ce403b00e0a3ac0c2968 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:41 +0000
Subject: [PATCH 402/444] Translate TooManyReturns.md via GitLocalize

---
 docs/en/diagnostics/TooManyReturns.md | 40 ++++++++-------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/docs/en/diagnostics/TooManyReturns.md b/docs/en/diagnostics/TooManyReturns.md
index 38dc0effd2c..a6443a354e1 100644
--- a/docs/en/diagnostics/TooManyReturns.md
+++ b/docs/en/diagnostics/TooManyReturns.md
@@ -1,16 +1,17 @@
 # Methods should not have too many return statements (TooManyReturns)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `No` | `20` | `brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `No` | `20` | `brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxReturnsCount` | `Integer` | ```Maximum allowed return statements per method``` | ```3``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxReturnsCount` | `Integer` | `Maximum allowed return statements per method` | `3`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -24,29 +25,11 @@ A large number of returns in a method (procedure or function) increases its comp
 Bad method example
 
 ```bsl
-Function Example(Condition)
-    If Condition = 1 Then
-        Return "Check passed";
-    ElsIf Condition = 2 Then
-        ExecuteSomething();
-        Return "Check not passed";
-    ElsIf Condition > 7 Then
-        Если Validate(Contidtion) Then
-            Return "Check passed";
-        Else
-            Return "Check not passed";
-        EndIf;
-    EndIf;
-    Return "";
-EndFunction
+Function Example(Condition)     If Condition = 1 Then         Return "Check passed";     ElsIf Condition = 2 Then         ExecuteSomething();         Return "Check not passed";     ElsIf Condition > 7 Then         Если Validate(Contidtion) Then             Return "Check passed";         Else             Return "Check not passed";         EndIf;     EndIf;     Return ""; EndFunction
 ```
 
 ## Sources
 
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-
-
-
 - [Why Many Return Statements Are a Bad Idea in OOP](https://www.yegor256.com/2015/08/18/multiple-return-statements-in-oop.html)
 - [JAVA: Methods should not have too many return statements](https://rules.sonarsource.com/java/RSPEC-1142)
 - [Why fast return is so important? (RU)](https://habr.com/ru/post/348074/)
@@ -54,6 +37,7 @@ EndFunction
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
@@ -64,7 +48,5 @@ EndFunction
 ### Parameter for config
 
 ```json
-"TooManyReturns": {
-    "maxReturnsCount": 3
-}
+"TooManyReturns": {     "maxReturnsCount": 3 }
 ```

From b1aff0df8a9098da52892542cf8460589f439cea Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:38:43 +0000
Subject: [PATCH 403/444] Translate OSUsersMethod.md via GitLocalize

---
 docs/en/diagnostics/OSUsersMethod.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/OSUsersMethod.md b/docs/en/diagnostics/OSUsersMethod.md
index 8c6799363d1..bd72c6231ff 100644
--- a/docs/en/diagnostics/OSUsersMethod.md
+++ b/docs/en/diagnostics/OSUsersMethod.md
@@ -1,15 +1,19 @@
 # Using method OSUsers (OSUsersMethod)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `suspicious` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `suspicious`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
+
 Using method may carry a malicious function.
 
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
 Source: [Pass-the-hash attack](https://en.wikipedia.org/wiki/Pass_the_hash)
@@ -17,11 +21,11 @@ Source: [Pass-the-hash attack](https://en.wikipedia.org/wiki/Pass_the_hash)
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:OSUsersMethod-off
-// BSLLS:OSUsersMethod-on
+// BSLLS:OSUsersMethod-off // BSLLS:OSUsersMethod-on
 ```
 
 ### Parameter for config

From 95e87d422759652896efcb2959d77a0213d3985f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:44 +0000
Subject: [PATCH 404/444] Translate NumberOfValuesInStructureConstructor.md via
 GitLocalize

---
 .../NumberOfValuesInStructureConstructor.md      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md b/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
index 0b356f6fff0..ec37e96d6c6 100644
--- a/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
+++ b/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
@@ -1,16 +1,17 @@
 # Limit on the number of property values passed to the structure constructor (NumberOfValuesInStructureConstructor)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `10` | `standard`<br/>`brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `10` | `standard`<br>`brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxValuesCount` | `Integer` | ```Allowed number parameter values passed to structure constructor``` | ```3``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxValuesCount` | `Integer` | `Allowed number parameter values passed to structure constructor` | `3`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 When creating an object of type Structure it is not recommended to pass more than 3 property values to the constructor. Instead, it is recommended to use the Insert method or assign values to properties explicitly.
@@ -68,6 +69,7 @@ Correct:
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 62d519454ee906311e90a8b193fd152507e1c706 Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:46 +0000
Subject: [PATCH 405/444] Translate NumberOfParams.md via GitLocalize

---
 docs/en/diagnostics/NumberOfParams.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/en/diagnostics/NumberOfParams.md b/docs/en/diagnostics/NumberOfParams.md
index 98b2684f54b..f2dbea72b09 100644
--- a/docs/en/diagnostics/NumberOfParams.md
+++ b/docs/en/diagnostics/NumberOfParams.md
@@ -1,20 +1,20 @@
 # Number of parameters in method (NumberOfParams)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `30` | `standard`<br/>`brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `30` | `standard`<br>`brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxParamsCount` | `Integer` | ```Max number of params count``` | ```7``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxParamsCount` | `Integer` | `Max number of params count` | `7`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
-It is not recommended to declare many parameters in functions (best practice to use not more than seven parameters). In So doing there should not be many parameters with default values set (best practice to have not more than three such parameters). Otherwise code readability decreases.
-For example it is easy to make a mistake in number of commas passing optional parameters.
+It is not recommended to declare many parameters in functions (best practice to use not more than seven parameters). In So doing there should not be many parameters with default values set (best practice to have not more than three such parameters). Otherwise code readability decreases.  For example it is easy to make a mistake in number of commas passing optional parameters.
 
 If need to pass many parameters to a function, it is recommended to group same-type parameters into one or more composite parameters of type Structure.
 
@@ -30,8 +30,7 @@ EndProcedure
 ```
 
 Correct:
-
-Group parameters, having goods item properties into Structure ЗначенияРеквизитов.
+ Group parameters, having goods item properties into Structure ЗначенияРеквизитов.
 
 ```bsl
 // Create item in catalog "Goods"
@@ -47,6 +46,7 @@ EndProcedure
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From fc66a23ca755f343b0123ca48c0a33e9c36a6f3a Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:47 +0000
Subject: [PATCH 406/444] Translate NumberOfOptionalParams.md via GitLocalize

---
 docs/en/diagnostics/NumberOfOptionalParams.md | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/docs/en/diagnostics/NumberOfOptionalParams.md b/docs/en/diagnostics/NumberOfOptionalParams.md
index a821dc50ad9..8814254ec11 100644
--- a/docs/en/diagnostics/NumberOfOptionalParams.md
+++ b/docs/en/diagnostics/NumberOfOptionalParams.md
@@ -1,22 +1,21 @@
 # Limit number of optional parameters in method (NumberOfOptionalParams)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `30` | `standard`<br/>`brainoverload` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `30` | `standard`<br>`brainoverload`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxOptionalParamsCount` | `Integer` | ```Max number of optional parameters``` | ```3``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxOptionalParamsCount` | `Integer` | `Max number of optional parameters` | `3`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 It is not recommended to declare many parameters in functions (best practice to use not more than seven parameters). Meanwhile there should not be many parameters with default values set (best practice to have not more than three such parameters). Otherwise code readability decreases.
- 
-For example it is easy to make a mistake in number of commas passing optional parameters.
-If need to pass many parameters to a function, it is recommended to group same-type parameters into one or more composite parameters of type Structure.
+  For example it is easy to make a mistake in number of commas passing optional parameters. If need to pass many parameters to a function, it is recommended to group same-type parameters into one or more composite parameters of type Structure.
 
 ## Examples
 
@@ -30,8 +29,7 @@ EndProcedure
 ```
 
 Correct:
-
-Group parameters, having goods item properties into Structure ЗначенияРеквизитов.
+ Group parameters, having goods item properties into Structure ЗначенияРеквизитов.
 
 ```bsl
 // Create an item in the catalog "Goods"
@@ -47,6 +45,7 @@ EndProcedure
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From c8766c43b0808232e1b49fbb3dfc1b31e77bd27a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:49 +0000
Subject: [PATCH 407/444] Translate NonStandardRegion.md via GitLocalize

---
 docs/en/diagnostics/NonStandardRegion.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/NonStandardRegion.md b/docs/en/diagnostics/NonStandardRegion.md
index c3a74c4220e..88c4397ca13 100644
--- a/docs/en/diagnostics/NonStandardRegion.md
+++ b/docs/en/diagnostics/NonStandardRegion.md
@@ -1,10 +1,11 @@
 # Non-standard region of module (NonStandardRegion)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -20,18 +21,16 @@ All module code should be structured and divided into sections (regions).
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - Reference: [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:NonStandardRegion-off
-// BSLLS:NonStandardRegion-on
+// BSLLS:NonStandardRegion-off // BSLLS:NonStandardRegion-on
 ```
 
 ### Parameter for config

From 83ff4047a54b938d0f6efd3fd51c6cde2b5f6809 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:50 +0000
Subject: [PATCH 408/444] Translate UsingExternalCodeTools.md via GitLocalize

---
 docs/en/diagnostics/UsingExternalCodeTools.md | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/en/diagnostics/UsingExternalCodeTools.md b/docs/en/diagnostics/UsingExternalCodeTools.md
index f5e26a0544e..3362da9453e 100644
--- a/docs/en/diagnostics/UsingExternalCodeTools.md
+++ b/docs/en/diagnostics/UsingExternalCodeTools.md
@@ -1,24 +1,24 @@
 # Using external code tools (UsingExternalCodeTools)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Security Hotspot` | `BSL`<br/>`OS` | `Critical` | `Yes` | `15` | `standard`<br/>`design` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Security Hotspot` | `BSL`<br>`OS` | `Critical` | `Yes` | `15` | `standard`<br>`design`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
 For application solutions it is forbidden to execute in unsafe mode any code on the 1C:Enterprise server that is not part of the application solution (configuration) itself.
-
-The restriction does not apply to the code that has passed the audit, and to the code executed on the client.
+ The restriction does not apply to the code that has passed the audit, and to the code executed on the client.
 
 Examples of invalid execution of "external" code in unsafe mode:
 
 - external reports and processings (print forms, etc.)
 - configuration extensions
 
-### Limitations
+### Diagnostic ignorance in code
 
 At the moment, the server context is not analyzed, so diagnostic works both at client and server contexts
 
@@ -30,18 +30,16 @@ At the moment, the server context is not analyzed, so diagnostic works both at c
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - [Restriction on the execution of "external" code](https://its.1c.ru/db/v8std#content:669:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-### Diagnostic ignorance in code
+
+### Экранирование кода
 
 ```bsl
-// BSLLS:UsingExternalCodeTools-off
-// BSLLS:UsingExternalCodeTools-on
+// BSLLS:UsingExternalCodeTools-off // BSLLS:UsingExternalCodeTools-on
 ```
 
 ### Parameter for config

From f17179119589ce82ce2d09d8a227fb17382ae226 Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 13:38:51 +0000
Subject: [PATCH 409/444] Translate UsingExternalCodeTools.md via GitLocalize

---
 docs/en/diagnostics/UsingExternalCodeTools.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/diagnostics/UsingExternalCodeTools.md b/docs/en/diagnostics/UsingExternalCodeTools.md
index 3362da9453e..76a0028c3d7 100644
--- a/docs/en/diagnostics/UsingExternalCodeTools.md
+++ b/docs/en/diagnostics/UsingExternalCodeTools.md
@@ -36,7 +36,7 @@ At the moment, the server context is not analyzed, so diagnostic works both at c
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
 
-### Экранирование кода
+### Parameter for config
 
 ```bsl
 // BSLLS:UsingExternalCodeTools-off // BSLLS:UsingExternalCodeTools-on

From b95c71d1bdf09886124296d179ba7e56b38e0701 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:52 +0000
Subject: [PATCH 410/444] Translate TimeoutsInExternalResources.md via
 GitLocalize

---
 .../TimeoutsInExternalResources.md            | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/docs/en/diagnostics/TimeoutsInExternalResources.md b/docs/en/diagnostics/TimeoutsInExternalResources.md
index 18fda82538d..544a9d91eed 100644
--- a/docs/en/diagnostics/TimeoutsInExternalResources.md
+++ b/docs/en/diagnostics/TimeoutsInExternalResources.md
@@ -1,21 +1,21 @@
 # Timeouts working with external resources (TimeoutsInExternalResources)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL`<br/>`OS` | `Critical` | `Yes` | `5` | `unpredictable`<br/>`standard` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL`<br>`OS` | `Critical` | `Yes` | `5` | `unpredictable`<br>`standard`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `analyzeInternetMailProfileZeroTimeout` | `Boolean` | ```Analyze the timeout for "InternetMailProfile"``` | ```true``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`analyzeInternetMailProfileZeroTimeout` | `Boolean` | `Analyze the timeout for "InternetMailProfile"` | `true`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 When working with external resources using the WSDefinitions, WSProxy, HTTPConnection, FTPConnection there should be a time out - the time limit for the operation to be completed. Otherwise, as a result of endless waiting, the program will freeze or some of the functionality of the program will become unavailable.
-
-For the InternetMailProfile the platform sets the default timeout value to 30 seconds, but despite this, it is worth explicitly specifying the timeout value when using it.
+ For the InternetMailProfile the platform sets the default timeout value to 30 seconds, but despite this, it is worth explicitly specifying the timeout value when using it.
 
 Setting a timeout protects against external factors:
 
@@ -53,12 +53,13 @@ HTTPConnection.Timeout = 1;
 
 ## Reference
 
-- [Timeouts when working with external resources](https://its.1c.ru/db/v8std#content:748:hdoc)
-- [InternetMail Profilehas a default timeout](https://its.1c.ru/db/metod8dev/content/2358/hdoc)
+- [](https://its.1c.ru/db/v8std#content:748:hdoc)[Timeouts when working with external resources](https://its.1c.ru/db/v8std#content:748:hdoc)
+- [](https://its.1c.ru/db/metod8dev/content/2358/hdoc)[InternetMail Profilehas a default timeout](https://its.1c.ru/db/metod8dev/content/2358/hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 2db936739c21912ad15dcd01225e7d1b41837bf1 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Fri, 22 May 2020 13:38:54 +0000
Subject: [PATCH 411/444] Translate DiagnosticIgnorance.md via GitLocalize

---
 docs/en/features/DiagnosticIgnorance.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/features/DiagnosticIgnorance.md b/docs/en/features/DiagnosticIgnorance.md
index 99674fc36a0..fa4732b679b 100644
--- a/docs/en/features/DiagnosticIgnorance.md
+++ b/docs/en/features/DiagnosticIgnorance.md
@@ -6,8 +6,7 @@ Instead of manually mark a comment as irrelevant every time, BSL LS provides fun
 
 ## Description
 
-To hide part of the code from the BSL LS analyzer, you must add a special comment to the code.
- The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
+To hide part of the code from the BSL LS analyzer, you must add a special comment to the code. The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
 
 - `Prefix` always is `// BSLLS`
 - `DiagnosticKey` can be found in the [list of diagnostics](../diagnostics/index.md) by description.

From 0145dca44009dba5d9c0f4d8b0b95f024e108c51 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Fri, 22 May 2020 13:38:55 +0000
Subject: [PATCH 412/444] Translate DiagnosticIgnorance.md via GitLocalize

---
 docs/en/features/DiagnosticIgnorance.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/features/DiagnosticIgnorance.md b/docs/en/features/DiagnosticIgnorance.md
index fa4732b679b..99674fc36a0 100644
--- a/docs/en/features/DiagnosticIgnorance.md
+++ b/docs/en/features/DiagnosticIgnorance.md
@@ -6,7 +6,8 @@ Instead of manually mark a comment as irrelevant every time, BSL LS provides fun
 
 ## Description
 
-To hide part of the code from the BSL LS analyzer, you must add a special comment to the code. The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
+To hide part of the code from the BSL LS analyzer, you must add a special comment to the code.
+ The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
 
 - `Prefix` always is `// BSLLS`
 - `DiagnosticKey` can be found in the [list of diagnostics](../diagnostics/index.md) by description.

From 7f8323e97756d04dbbf83b750569706890cba590 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:56 +0000
Subject: [PATCH 413/444] Translate NestedFunctionInParameters.md via
 GitLocalize

---
 .../diagnostics/NestedFunctionInParameters.md | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/docs/en/diagnostics/NestedFunctionInParameters.md b/docs/en/diagnostics/NestedFunctionInParameters.md
index 5b3d027c055..cc34a422624 100644
--- a/docs/en/diagnostics/NestedFunctionInParameters.md
+++ b/docs/en/diagnostics/NestedFunctionInParameters.md
@@ -1,17 +1,17 @@
 # Initialization of method and constructor parameters by calling nested methods (NestedFunctionInParameters)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `5` | `standard`<br/>`brainoverload`<br/>`badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `5` | `standard`<br>`brainoverload`<br>`badpractice`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
 When passing parameters to function, it is not recommended to use nested calls of other functions.
-
-Similarly, it is not recommended to use nested calls of other functions or other parameterized constructors when initializing constructor parameters.
+ Similarly, it is not recommended to use nested calls of other functions or other parameterized constructors when initializing constructor parameters.
 
 At the same time, if the code with nested calls is compact (does not require the hyphenation of expressions) and is easy to read, then nested calls are acceptable.
 
@@ -22,36 +22,29 @@ At the same time, if the code with nested calls is compact (does not require the
 Wrong:
 
 ```bsl
-Attachments.Insert(
- AttachedFile.Description,
- New Picture(GetFromTempStorage(
-  AttachedFiles.GetFileData(AttachedFile.Ref).RefToFileBinaryData)));
+Attachments.Insert(  AttachedFile.Description,  New Picture(GetFromTempStorage(   AttachedFiles.GetFileData(AttachedFile.Ref).RefToFileBinaryData)));
 ```
 
 It is correct to break such calls into separate operators using additional local variables:
 
 ```bsl
-FileImageHRef = AttachedFiles.GetFileData(AttachedFile.Ref).RefToFileBinaryData;
-PictureData = New Picture(GetFromTempStorage(FileImageHRef));
-Attachments.Insert(AttachedFile.Description, PictureData);
+FileImageHRef = AttachedFiles.GetFileData(AttachedFile.Ref).RefToFileBinaryData; PictureData = New Picture(GetFromTempStorage(FileImageHRef)); Attachments.Insert(AttachedFile.Description, PictureData);
 ```
 
 ## Sources
 
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
-
 - [Parameters of procedures and functions (RU)](https://its.1c.ru/db/v8std#content:640:hdoc)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:NestedFunctionInParameters-off
-// BSLLS:NestedFunctionInParameters-on
+// BSLLS:NestedFunctionInParameters-off // BSLLS:NestedFunctionInParameters-on
 ```
 
 ### Parameter for config

From b14c69cad93dd980a1ed2fc6a959af9b15aa8ef0 Mon Sep 17 00:00:00 2001
From: Dmitry Mironov <dmitry.g.mironov@gmail.com>
Date: Fri, 22 May 2020 13:38:58 +0000
Subject: [PATCH 414/444] Translate MethodSize.md via GitLocalize

---
 docs/en/diagnostics/MethodSize.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/en/diagnostics/MethodSize.md b/docs/en/diagnostics/MethodSize.md
index 33027e71da9..db52d7f8a1b 100644
--- a/docs/en/diagnostics/MethodSize.md
+++ b/docs/en/diagnostics/MethodSize.md
@@ -1,21 +1,21 @@
 # Method size (MethodSize)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Major` | `Yes` | `30` | `badpractice` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Major` | `Yes` | `30` | `badpractice`
 
-## Parameters 
+## Parameters
 
-| Name | Type | Description | Default value |
-| :-: | :-: | :-- | :-: |
-| `maxMethodSize` | `Integer` | ```Max method line count.``` | ```200``` |
+Name | Type | Description | Default value
+:-: | :-: | :-- | :-:
+`maxMethodSize` | `Integer` | `Max method line count.` | `200`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 There are cumbersome methods (procedures and functions) which mskes it impossible to work effectively precisely because of their huge size.
-
-A large method often arises when a developer adds new functionality to a method. “Why should I put the parameter check in a separate method, if I can write it here?”, “Why do I need to create a separate method for the search of maximum element in the array, let’s leave it here. So the code is clearer”, and other misconceptions.
+ A large method often arises when a developer adds new functionality to a method. “Why should I put the parameter check in a separate method, if I can write it here?”, “Why do I need to create a separate method for the search of maximum element in the array, let’s leave it here. So the code is clearer”, and other misconceptions.
 
 There are two rules for refactoring a large method:
 
@@ -24,14 +24,15 @@ There are two rules for refactoring a large method:
 
 ## Reference
 
-- [Software Architecture Refactoring: Layering](http://citforum.ru/SE/project/refactor/)
-- [Martin Fowler: Refactoring](https://www.refactoring.com/)
-- [Refactoring and opt-out tools](https://v8.1c.ru/o7/201312ref/index.htm)
-- [Refactoring tools in 1C](https://www.koderline.ru/expert/programming/article-vspomogatelnye-funktsii-v-1s/#anchor6)
+- [](http://citforum.ru/SE/project/refactor/)[Software Architecture Refactoring: Layering](http://citforum.ru/SE/project/refactor/)
+- [](https://www.refactoring.com/)[Martin Fowler: Refactoring](https://www.refactoring.com/)
+- [](https://v8.1c.ru/o7/201312ref/index.htm)[Refactoring and opt-out tools](https://v8.1c.ru/o7/201312ref/index.htm)
+- [](https://www.koderline.ru/expert/programming/article-vspomogatelnye-funktsii-v-1s/#anchor6)[Refactoring tools in 1C](https://www.koderline.ru/expert/programming/article-vspomogatelnye-funktsii-v-1s/#anchor6)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 7679dd886275c7c4fd12210706bda0d98a74735e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 13:38:59 +0000
Subject: [PATCH 415/444] Translate MethodSize.md via GitLocalize


From d6c64119a1dd7ee18a14c446915d2008cd08415c Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Fri, 22 May 2020 16:46:11 +0300
Subject: [PATCH 416/444] precommit

---
 docs/diagnostics/CommonModuleAssign.md        |   1 -
 .../FunctionReturnsSamePrimitive.md           |   1 -
 docs/en/diagnostics/CachedPublic.md           |  11 +-
 docs/en/diagnostics/CodeBlockBeforeSub.md     |  11 +-
 docs/en/diagnostics/CodeOutOfRegion.md        |  11 +-
 docs/en/diagnostics/CommentedCode.md          |  16 +-
 docs/en/diagnostics/CommonModuleAssign.md     |  11 +-
 .../en/diagnostics/CommonModuleInvalidType.md |   1 -
 docs/en/diagnostics/CommonModuleNameCached.md |  11 +-
 docs/en/diagnostics/CommonModuleNameClient.md |  11 +-
 .../CommonModuleNameClientServer.md           |  11 +-
 .../diagnostics/CommonModuleNameFullAccess.md |  11 +-
 docs/en/diagnostics/CommonModuleNameGlobal.md |  11 +-
 .../CommonModuleNameGlobalClient.md           |  11 +-
 .../diagnostics/CommonModuleNameServerCall.md |  11 +-
 docs/en/diagnostics/CommonModuleNameWords.md  |  23 +-
 docs/en/diagnostics/ConsecutiveEmptyLines.md  |  23 +-
 docs/en/diagnostics/CyclomaticComplexity.md   |  26 +-
 docs/en/diagnostics/DataExchangeLoading.md    |  23 +-
 .../diagnostics/DeprecatedAttributes8312.md   |   1 -
 docs/en/diagnostics/DeprecatedMethodCall.md   |  11 +-
 .../diagnostics/DeprecatedTypeManagedForm.md  |  13 +-
 docs/en/diagnostics/ExcessiveAutoTestCheck.md |   8 +-
 docs/en/diagnostics/ExecuteExternalCode.md    |  11 +-
 .../ExecuteExternalCodeInCommonModule.md      |  11 +-
 .../FunctionReturnsSamePrimitive.md           |   1 -
 .../diagnostics/IsInRoleMethodDiagnostic.md   |  11 +-
 docs/en/diagnostics/LineLength.md             |  16 +-
 docs/en/diagnostics/MethodSize.md             |  16 +-
 docs/en/diagnostics/MissingSpace.md           |  24 +-
 .../MissingVariablesDescription.md            |  17 +-
 .../diagnostics/NestedFunctionInParameters.md |  11 +-
 docs/en/diagnostics/NestedStatements.md       |  16 +-
 docs/en/diagnostics/NonStandardRegion.md      |  11 +-
 docs/en/diagnostics/NumberOfOptionalParams.md |  16 +-
 docs/en/diagnostics/NumberOfParams.md         |  16 +-
 .../NumberOfValuesInStructureConstructor.md   |  16 +-
 docs/en/diagnostics/OSUsersMethod.md          |  11 +-
 docs/en/diagnostics/ThisObjectAssign.md       |   8 +-
 .../TimeoutsInExternalResources.md            |  16 +-
 docs/en/diagnostics/TooManyReturns.md         |  20 +-
 .../diagnostics/UnsafeSafeModeMethodCall.md   |  11 +-
 docs/en/diagnostics/UsingCancelParameter.md   |   8 +-
 docs/en/diagnostics/UsingExternalCodeTools.md |  13 +-
 docs/en/diagnostics/UsingGoto.md              |   8 +-
 .../UsingHardcodeSecretInformation.md         |  16 +-
 docs/en/diagnostics/index.md                  | 234 +++++++++---------
 47 files changed, 375 insertions(+), 431 deletions(-)

diff --git a/docs/diagnostics/CommonModuleAssign.md b/docs/diagnostics/CommonModuleAssign.md
index 472cccb60ac..092c12a57b8 100644
--- a/docs/diagnostics/CommonModuleAssign.md
+++ b/docs/diagnostics/CommonModuleAssign.md
@@ -18,7 +18,6 @@
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/diagnostics/FunctionReturnsSamePrimitive.md b/docs/diagnostics/FunctionReturnsSamePrimitive.md
index d1cd7ea76cd..0942ee7c781 100644
--- a/docs/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/diagnostics/FunctionReturnsSamePrimitive.md
@@ -71,7 +71,6 @@
 ## Источники
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
 ## Сниппеты
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/CachedPublic.md b/docs/en/diagnostics/CachedPublic.md
index 8c3d2758e67..ea9dd328738 100644
--- a/docs/en/diagnostics/CachedPublic.md
+++ b/docs/en/diagnostics/CachedPublic.md
@@ -1,11 +1,10 @@
 # Cached public methods (CachedPublic)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`design`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 You should not create a programming interface in modules that reuse return values.
@@ -25,11 +24,11 @@ You should not create a programming interface in modules that reuse return value
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CachedPublic-off // BSLLS:CachedPublic-on
+// BSLLS:CachedPublic-off
+// BSLLS:CachedPublic-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CodeBlockBeforeSub.md b/docs/en/diagnostics/CodeBlockBeforeSub.md
index 7f12db31f6b..64240992b8b 100644
--- a/docs/en/diagnostics/CodeBlockBeforeSub.md
+++ b/docs/en/diagnostics/CodeBlockBeforeSub.md
@@ -1,11 +1,10 @@
 # Method definitions must be placed before the module body operators (CodeBlockBeforeSub)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `5` | `error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `5` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -37,11 +36,11 @@ Method(); Message("Before methods");  Procedure Method() // Method body EndProce
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CodeBlockBeforeSub-off // BSLLS:CodeBlockBeforeSub-on
+// BSLLS:CodeBlockBeforeSub-off
+// BSLLS:CodeBlockBeforeSub-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CodeOutOfRegion.md b/docs/en/diagnostics/CodeOutOfRegion.md
index 226cc579200..00419a39f53 100644
--- a/docs/en/diagnostics/CodeOutOfRegion.md
+++ b/docs/en/diagnostics/CodeOutOfRegion.md
@@ -1,11 +1,10 @@
 # Code out of region (CodeOutOfRegion)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -26,11 +25,11 @@ The code of module should be structured and divided into regions.
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CodeOutOfRegion-off // BSLLS:CodeOutOfRegion-on
+// BSLLS:CodeOutOfRegion-off
+// BSLLS:CodeOutOfRegion-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommentedCode.md b/docs/en/diagnostics/CommentedCode.md
index b7fad278551..e66dc1fa5a4 100644
--- a/docs/en/diagnostics/CommentedCode.md
+++ b/docs/en/diagnostics/CommentedCode.md
@@ -1,17 +1,16 @@
 # Commented out code (CommentedCode)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`badpractice` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`threshold` | `Float` | `Threshold` | `0.9`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `threshold` | `Float` | ```Threshold``` | ```0.9``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 Software modules should not have commented out code fragments, as well as fragments, which are in any way connected with the development process (debugging code, service marks, i.e. !!! _, MRG, etc.) and with specific developers of this code.
@@ -48,7 +47,6 @@ Correct: after debugging or refactoring is completed, remove the handler BeforeD
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
index b5677b9b7b9..a47d0787ec7 100644
--- a/docs/en/diagnostics/CommonModuleAssign.md
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -1,11 +1,10 @@
 # CommonModuleAssign (CommonModuleAssign)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `2` | `error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `2` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -23,11 +22,11 @@ When assigning a value to a common module, an exception will be thrown. This sit
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleAssign-off // BSLLS:CommonModuleAssign-on
+// BSLLS:CommonModuleAssign-off
+// BSLLS:CommonModuleAssign-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleInvalidType.md b/docs/en/diagnostics/CommonModuleInvalidType.md
index 131f975132f..a9d3ab73b58 100644
--- a/docs/en/diagnostics/CommonModuleInvalidType.md
+++ b/docs/en/diagnostics/CommonModuleInvalidType.md
@@ -14,7 +14,6 @@
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/CommonModuleNameCached.md b/docs/en/diagnostics/CommonModuleNameCached.md
index 2b0976efa38..7303ee32976 100644
--- a/docs/en/diagnostics/CommonModuleNameCached.md
+++ b/docs/en/diagnostics/CommonModuleNameCached.md
@@ -1,11 +1,10 @@
 # Missed postfix "Cached" (CommonModuleNameCached)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -27,11 +26,11 @@ FilesClientCached, UsersInternalCached
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameCached-off // BSLLS:CommonModuleNameCached-on
+// BSLLS:CommonModuleNameCached-off
+// BSLLS:CommonModuleNameCached-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameClient.md b/docs/en/diagnostics/CommonModuleNameClient.md
index b744d05e939..add709020a0 100644
--- a/docs/en/diagnostics/CommonModuleNameClient.md
+++ b/docs/en/diagnostics/CommonModuleNameClient.md
@@ -1,11 +1,10 @@
 # Missed postfix "Client" (CommonModuleNameClient)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -34,11 +33,11 @@ FilesClient, CommonClient, StandardSubsystemsClient
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameClient-off // BSLLS:CommonModuleNameClient-on
+// BSLLS:CommonModuleNameClient-off
+// BSLLS:CommonModuleNameClient-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameClientServer.md b/docs/en/diagnostics/CommonModuleNameClientServer.md
index 31adbc2d81a..2ba5696387d 100644
--- a/docs/en/diagnostics/CommonModuleNameClientServer.md
+++ b/docs/en/diagnostics/CommonModuleNameClientServer.md
@@ -1,11 +1,10 @@
 # Missed postfix "ClientServer" (CommonModuleNameClientServer)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -34,11 +33,11 @@ FilesClientServer, CommonClientServer, UsersClientServer
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameClientServer-off // BSLLS:CommonModuleNameClientServer-on
+// BSLLS:CommonModuleNameClientServer-off
+// BSLLS:CommonModuleNameClientServer-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameFullAccess.md b/docs/en/diagnostics/CommonModuleNameFullAccess.md
index eb5f07f8dad..cec4e87981f 100644
--- a/docs/en/diagnostics/CommonModuleNameFullAccess.md
+++ b/docs/en/diagnostics/CommonModuleNameFullAccess.md
@@ -1,11 +1,10 @@
 # Missed postfix "FullAccess" (CommonModuleNameFullAccess)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Security Hotspot` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Security Hotspot` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -27,11 +26,11 @@ FilesFullAccess
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameFullAccess-off // BSLLS:CommonModuleNameFullAccess-on
+// BSLLS:CommonModuleNameFullAccess-off
+// BSLLS:CommonModuleNameFullAccess-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameGlobal.md b/docs/en/diagnostics/CommonModuleNameGlobal.md
index cbe16e6d808..743f4e9b859 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobal.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobal.md
@@ -1,11 +1,10 @@
 # Missed postfix "Global" (CommonModuleNameGlobal)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br>`badpractice`<br>`brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`brainoverload` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -27,11 +26,11 @@ FilesGlobal, InfobaseUpdateGlobal
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameGlobal-off // BSLLS:CommonModuleNameGlobal-on
+// BSLLS:CommonModuleNameGlobal-off
+// BSLLS:CommonModuleNameGlobal-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameGlobalClient.md b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
index 204219b29a2..43dba3146ca 100644
--- a/docs/en/diagnostics/CommonModuleNameGlobalClient.md
+++ b/docs/en/diagnostics/CommonModuleNameGlobalClient.md
@@ -1,11 +1,10 @@
 # Global module with postfix "Client" (CommonModuleNameGlobalClient)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -29,11 +28,11 @@ Correct: InfobaseUpdateGlobal
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameGlobalClient-off // BSLLS:CommonModuleNameGlobalClient-on
+// BSLLS:CommonModuleNameGlobalClient-off
+// BSLLS:CommonModuleNameGlobalClient-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameServerCall.md b/docs/en/diagnostics/CommonModuleNameServerCall.md
index b5ec3557db5..deef866b549 100644
--- a/docs/en/diagnostics/CommonModuleNameServerCall.md
+++ b/docs/en/diagnostics/CommonModuleNameServerCall.md
@@ -1,11 +1,10 @@
 # Missed postfix "ServerCall" (CommonModuleNameServerCall)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Minor` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -31,11 +30,11 @@ FilesServerCall, CommonServerCall
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameServerCall-off // BSLLS:CommonModuleNameServerCall-on
+// BSLLS:CommonModuleNameServerCall-off
+// BSLLS:CommonModuleNameServerCall-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/CommonModuleNameWords.md b/docs/en/diagnostics/CommonModuleNameWords.md
index 2423c0a64af..1e40089fa33 100644
--- a/docs/en/diagnostics/CommonModuleNameWords.md
+++ b/docs/en/diagnostics/CommonModuleNameWords.md
@@ -1,17 +1,16 @@
 # Unrecommended common module name (CommonModuleNameWords)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `5` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `standard` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`words` | `String` | `Unrecommended words` | ```процедуры
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `words` | `String` | ```Unrecommended words``` | ```процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 It is not recommended to use the words "Procedures", "Functions", "Handlers", "Module", "Functionality" in the name of the general module
@@ -27,15 +26,17 @@ It is not recommended to use the words "Procedures", "Functions", "Handlers", "M
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CommonModuleNameWords-off // BSLLS:CommonModuleNameWords-on
+// BSLLS:CommonModuleNameWords-off
+// BSLLS:CommonModuleNameWords-on
 ```
 
 ### Parameter for config
 
 ```json
-"CommonModuleNameWords": {     "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality" }
+"CommonModuleNameWords": {
+    "words": "процедуры|procedures|функции|functions|обработчики|handlers|модуль|module|функциональность|functionality"
+}
 ```
diff --git a/docs/en/diagnostics/ConsecutiveEmptyLines.md b/docs/en/diagnostics/ConsecutiveEmptyLines.md
index b3e8bcc5041..e6a84a1016e 100644
--- a/docs/en/diagnostics/ConsecutiveEmptyLines.md
+++ b/docs/en/diagnostics/ConsecutiveEmptyLines.md
@@ -1,17 +1,16 @@
 # Consecutive empty lines (ConsecutiveEmptyLines)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Info` | `Yes` | `1` | `badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `badpractice` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`allowedEmptyLinesCount` | `Integer` | `Maximum allowed consecutive empty lines` | `1`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `allowedEmptyLinesCount` | `Integer` | ```Maximum allowed consecutive empty lines``` | ```1``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -23,15 +22,17 @@ Inserting 2 or more empty lines does not carry this value and leads to a meaning
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ConsecutiveEmptyLines-off // BSLLS:ConsecutiveEmptyLines-on
+// BSLLS:ConsecutiveEmptyLines-off
+// BSLLS:ConsecutiveEmptyLines-on
 ```
 
 ### Parameter for config
 
 ```json
-"ConsecutiveEmptyLines": {     "allowedEmptyLinesCount": 1 }
+"ConsecutiveEmptyLines": {
+    "allowedEmptyLinesCount": 1
+}
 ```
diff --git a/docs/en/diagnostics/CyclomaticComplexity.md b/docs/en/diagnostics/CyclomaticComplexity.md
index c2dfe888371..ea241ca91bd 100644
--- a/docs/en/diagnostics/CyclomaticComplexity.md
+++ b/docs/en/diagnostics/CyclomaticComplexity.md
@@ -1,18 +1,17 @@
 # Cyclomatic complexity (CyclomaticComplexity)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `25` | `brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `25` | `brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`complexityThreshold` | `Integer` | `Complexity threshold` | `20`
-`checkModuleBody` | `Boolean` | `Check module body` | `true`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `complexityThreshold` | `Integer` | ```Complexity threshold``` | ```20``` |
+| `checkModuleBody` | `Boolean` | ```Check module body``` | ```true``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -51,15 +50,18 @@ Cyclomatic complexity increases by 1 for each of following constructions:
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:CyclomaticComplexity-off // BSLLS:CyclomaticComplexity-on
+// BSLLS:CyclomaticComplexity-off
+// BSLLS:CyclomaticComplexity-on
 ```
 
 ### Parameter for config
 
 ```json
-"CyclomaticComplexity": {     "complexityThreshold": 20,     "checkModuleBody": true }
+"CyclomaticComplexity": {
+    "complexityThreshold": 20,
+    "checkModuleBody": true
+}
 ```
diff --git a/docs/en/diagnostics/DataExchangeLoading.md b/docs/en/diagnostics/DataExchangeLoading.md
index 749ff03962b..757126f321e 100644
--- a/docs/en/diagnostics/DataExchangeLoading.md
+++ b/docs/en/diagnostics/DataExchangeLoading.md
@@ -1,17 +1,16 @@
 # There is no check for the attribute DataExchange.Load in the object's event handler (DataExchangeLoading)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL` | `Critical` | `Yes` | `5` | `standard`<br>`badpractice`<br>`unpredictable`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Critical` | `Yes` | `5` | `standard`<br/>`badpractice`<br/>`unpredictable` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`findFirst` | `Boolean` | `Check should go first` | `false`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `findFirst` | `Boolean` | ```Check should go first``` | ```false``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -48,15 +47,17 @@ Procedure BeforeWrite(Cancel)     If DataExchange.Load Then          Return;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DataExchangeLoading-off // BSLLS:DataExchangeLoading-on
+// BSLLS:DataExchangeLoading-off
+// BSLLS:DataExchangeLoading-on
 ```
 
 ### Parameter for config
 
 ```json
-"DataExchangeLoading": {     "findFirst": false }
+"DataExchangeLoading": {
+    "findFirst": false
+}
 ```
diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index 50e93e0f232..61634caf52f 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -14,7 +14,6 @@
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
index 02c6b1c895b..b1fb79443e5 100644
--- a/docs/en/diagnostics/DeprecatedMethodCall.md
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -1,11 +1,10 @@
 # Deprecated methods should not be used (DeprecatedMethodCall)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br>`design`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 Use or extension of deprecated methods should be avoided. Marking method as deprecated is a warning that means the method will be removed in future versions and left for temporary backward compatibility.
@@ -29,11 +28,11 @@ Exception: It is possible to call deprecated methods from deprecated methods.
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-"DeprecatedMethodCall": false
+// BSLLS:DeprecatedMethodCall-off
+// BSLLS:DeprecatedMethodCall-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/DeprecatedTypeManagedForm.md b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
index f847c828482..acfcbb53b61 100644
--- a/docs/en/diagnostics/DeprecatedTypeManagedForm.md
+++ b/docs/en/diagnostics/DeprecatedTypeManagedForm.md
@@ -1,11 +1,10 @@
-# Using deprecated type "ManagedForm" (DeprecatedTypeManagedForm)
+# Deprecated ManagedForm type (DeprecatedTypeManagedForm)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`<br>`deprecated`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`<br/>`deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -21,11 +20,11 @@ Starting from the platform version 8.3.14, the "ManagedForm" type has been renam
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedTypeManagedForm-off // BSLLS:DeprecatedTypeManagedForm-on
+// BSLLS:DeprecatedTypeManagedForm-off
+// BSLLS:DeprecatedTypeManagedForm-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/ExcessiveAutoTestCheck.md b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
index b79d70e0ab4..f37c7472c0f 100644
--- a/docs/en/diagnostics/ExcessiveAutoTestCheck.md
+++ b/docs/en/diagnostics/ExcessiveAutoTestCheck.md
@@ -1,11 +1,10 @@
 # Excessive AutoTest Check (ExcessiveAutoTestCheck)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`deprecated`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 Standard 772, Interaction with Automated Testing Tools, has been canceled. In this regard, verification of the "АвтоТест" parameter in the form code is no longer necessary.
@@ -33,7 +32,6 @@ EndIf;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/ExecuteExternalCode.md b/docs/en/diagnostics/ExecuteExternalCode.md
index 890556de909..51ee7264c44 100644
--- a/docs/en/diagnostics/ExecuteExternalCode.md
+++ b/docs/en/diagnostics/ExecuteExternalCode.md
@@ -1,11 +1,10 @@
 # Executing of external code on the server (ExecuteExternalCode)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Vulnerability` | `BSL` | `Critical` | `Yes` | `1` | `error`<br>`standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Vulnerability` | `BSL` | `Critical` | `Yes` | `1` | `error`<br/>`standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -28,11 +27,11 @@ It is forbidden to use the methods `Execute ` and `Eval` in server methods of mo
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ExecuteExternalCode-off // BSLLS:ExecuteExternalCode-on
+// BSLLS:ExecuteExternalCode-off
+// BSLLS:ExecuteExternalCode-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
index e8516b44c5e..65594abda11 100644
--- a/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
+++ b/docs/en/diagnostics/ExecuteExternalCodeInCommonModule.md
@@ -1,11 +1,10 @@
 # Executing of external code in a common module on the server (ExecuteExternalCodeInCommonModule)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `badpractice`<br>`standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `badpractice`<br/>`standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -28,11 +27,11 @@ If it is necessary to execute external code, then it must be located in a common
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:ExecuteExternalCodeInCommonModule-off // BSLLS:ExecuteExternalCodeInCommonModule-on
+// BSLLS:ExecuteExternalCodeInCommonModule-off
+// BSLLS:ExecuteExternalCodeInCommonModule-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
index a86e707ed40..9f4427dad45 100644
--- a/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
+++ b/docs/en/diagnostics/FunctionReturnsSamePrimitive.md
@@ -71,7 +71,6 @@ EndFunction
 ## Sources
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
diff --git a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
index 922a154cd0f..b4c713d534c 100644
--- a/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
+++ b/docs/en/diagnostics/IsInRoleMethodDiagnostic.md
@@ -1,11 +1,10 @@
 # IsInRole global method call (IsInRoleMethodDiagnostic)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Major` | `Yes` | `5` | `error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Major` | `Yes` | `5` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -45,11 +44,11 @@ Correct example: If IsInRole("Paymaster") OR PrivilegedMode() Then ...
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:IsInRoleMethodDiagnostic-off // BSLLS:IsInRoleMethodDiagnostic-on
+// BSLLS:IsInRoleMethodDiagnostic-off
+// BSLLS:IsInRoleMethodDiagnostic-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/LineLength.md b/docs/en/diagnostics/LineLength.md
index efcafce186d..f5066652b35 100644
--- a/docs/en/diagnostics/LineLength.md
+++ b/docs/en/diagnostics/LineLength.md
@@ -1,17 +1,16 @@
 # Line Length limit (LineLength)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`<br>`badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard`<br/>`badpractice` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxLineLength` | `Integer` | `Max length of string in characters` | `120`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxLineLength` | `Integer` | ```Max length of string in characters``` | ```120``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 If the line length is grater than 120 characters you should you line break. It is not recommended to have lines longer than 120 characters, except when line break is impossible (example, in code we have a string constant which is displayed without line breaks in message window using object MessageToUser).
@@ -23,7 +22,6 @@ If the line length is grater than 120 characters you should you line break. It i
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/MethodSize.md b/docs/en/diagnostics/MethodSize.md
index db52d7f8a1b..5fe23e9352f 100644
--- a/docs/en/diagnostics/MethodSize.md
+++ b/docs/en/diagnostics/MethodSize.md
@@ -1,17 +1,16 @@
 # Method size (MethodSize)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Major` | `Yes` | `30` | `badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Major` | `Yes` | `30` | `badpractice` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxMethodSize` | `Integer` | `Max method line count.` | `200`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxMethodSize` | `Integer` | ```Max method line count.``` | ```200``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 There are cumbersome methods (procedures and functions) which mskes it impossible to work effectively precisely because of their huge size.
@@ -32,7 +31,6 @@ There are two rules for refactoring a large method:
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/MissingSpace.md b/docs/en/diagnostics/MissingSpace.md
index fe5a0ced9b0..0a2f93ab405 100644
--- a/docs/en/diagnostics/MissingSpace.md
+++ b/docs/en/diagnostics/MissingSpace.md
@@ -1,21 +1,20 @@
 # Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; (MissingSpace)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Info` | `Yes` | `1` | `badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Info` | `Yes` | `1` | `badpractice` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`checkSpaceToRightOfUnary` | `Boolean` | `Check for space to the right of unary signs (+ -)` | `false`
-`listForCheckRight` | `String` | `List of symbols to check for the space to the right of (separated by space)` | `, ;`
-`listForCheckLeft` | `String` | `List of symbols to check for the space to the left of (separated by space)` | ``````
-`allowMultipleCommas` | `Boolean` | `Allow several commas in a row` | `false`
-`listForCheckLeftAndRight` | `String` | `List of symbols to check for the space from both sides of (separated by space)` | `+ - * / = % < > <> <= >=`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `checkSpaceToRightOfUnary` | `Boolean` | ```Check for space to the right of unary signs (+ -)``` | ```false``` |
+| `listForCheckRight` | `String` | ```List of symbols to check for the space to the right of (separated by space)``` | ```, ;``` |
+| `listForCheckLeft` | `String` | ```List of symbols to check for the space to the left of (separated by space)``` | `````` |
+| `allowMultipleCommas` | `Boolean` | ```Allow several commas in a row``` | ```false``` |
+| `listForCheckLeftAndRight` | `String` | ```List of symbols to check for the space from both sides of (separated by space)``` | ```+ - * / = % < > <> <= >=``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 To improve code readability to the left and right of operators `+ - * / = % < > <> <= >=` there must be spaces. Also, the space should be to the right of `,` и `;`
@@ -81,7 +80,6 @@ CommonModuleClientServer.MessageToUser(MessageText, , , , Cancel);     // Correc
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/MissingVariablesDescription.md b/docs/en/diagnostics/MissingVariablesDescription.md
index f00ab3c5c21..96e8f9765bc 100644
--- a/docs/en/diagnostics/MissingVariablesDescription.md
+++ b/docs/en/diagnostics/MissingVariablesDescription.md
@@ -1,11 +1,10 @@
 # All variables declarations must have a description (MissingVariablesDescription)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `1` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -32,18 +31,12 @@ Var Context; // Detailed description that explains the purpose of the variable
 
 ## Snippets
 
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-
-- Reference [Code conventions. Module structure](https://its.1c.ru/db/v8std#content:455:hdoc)
-
-## Snippets
-
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:MissingVariablesDescription-off // BSLLS:MissingVariablesDescription-on
+// BSLLS:MissingVariablesDescription-off
+// BSLLS:MissingVariablesDescription-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/NestedFunctionInParameters.md b/docs/en/diagnostics/NestedFunctionInParameters.md
index cc34a422624..41ace70721d 100644
--- a/docs/en/diagnostics/NestedFunctionInParameters.md
+++ b/docs/en/diagnostics/NestedFunctionInParameters.md
@@ -1,11 +1,10 @@
 # Initialization of method and constructor parameters by calling nested methods (NestedFunctionInParameters)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `5` | `standard`<br>`brainoverload`<br>`badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `5` | `standard`<br/>`brainoverload`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -40,11 +39,11 @@ FileImageHRef = AttachedFiles.GetFileData(AttachedFile.Ref).RefToFileBinaryData;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:NestedFunctionInParameters-off // BSLLS:NestedFunctionInParameters-on
+// BSLLS:NestedFunctionInParameters-off
+// BSLLS:NestedFunctionInParameters-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/NestedStatements.md b/docs/en/diagnostics/NestedStatements.md
index 10c950a8e4f..adb61af3736 100644
--- a/docs/en/diagnostics/NestedStatements.md
+++ b/docs/en/diagnostics/NestedStatements.md
@@ -1,17 +1,16 @@
 # Control flow statements should not be nested too deep (NestedStatements)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `30` | `badpractice`<br>`brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `30` | `badpractice`<br/>`brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxAllowedLevel` | `Integer` | `Max nested level` | `4`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxAllowedLevel` | `Integer` | ```Max nested level``` | ```4``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 Nested operators "If", "For", "ForEach", "While" and "Try" are key ingredients for so called "spaghetti-code".
@@ -48,7 +47,6 @@ EndIf;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/NonStandardRegion.md b/docs/en/diagnostics/NonStandardRegion.md
index 88c4397ca13..3a8072b2254 100644
--- a/docs/en/diagnostics/NonStandardRegion.md
+++ b/docs/en/diagnostics/NonStandardRegion.md
@@ -1,11 +1,10 @@
 # Non-standard region of module (NonStandardRegion)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `standard` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -26,11 +25,11 @@ All module code should be structured and divided into sections (regions).
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:NonStandardRegion-off // BSLLS:NonStandardRegion-on
+// BSLLS:NonStandardRegion-off
+// BSLLS:NonStandardRegion-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/NumberOfOptionalParams.md b/docs/en/diagnostics/NumberOfOptionalParams.md
index 8814254ec11..929ef30ac07 100644
--- a/docs/en/diagnostics/NumberOfOptionalParams.md
+++ b/docs/en/diagnostics/NumberOfOptionalParams.md
@@ -1,17 +1,16 @@
 # Limit number of optional parameters in method (NumberOfOptionalParams)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `30` | `standard`<br>`brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `30` | `standard`<br/>`brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxOptionalParamsCount` | `Integer` | `Max number of optional parameters` | `3`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxOptionalParamsCount` | `Integer` | ```Max number of optional parameters``` | ```3``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 It is not recommended to declare many parameters in functions (best practice to use not more than seven parameters). Meanwhile there should not be many parameters with default values set (best practice to have not more than three such parameters). Otherwise code readability decreases.
@@ -45,7 +44,6 @@ EndProcedure
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/NumberOfParams.md b/docs/en/diagnostics/NumberOfParams.md
index f2dbea72b09..b35180edc64 100644
--- a/docs/en/diagnostics/NumberOfParams.md
+++ b/docs/en/diagnostics/NumberOfParams.md
@@ -1,17 +1,16 @@
 # Number of parameters in method (NumberOfParams)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `30` | `standard`<br>`brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `30` | `standard`<br/>`brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxParamsCount` | `Integer` | `Max number of params count` | `7`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxParamsCount` | `Integer` | ```Max number of params count``` | ```7``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 It is not recommended to declare many parameters in functions (best practice to use not more than seven parameters). In So doing there should not be many parameters with default values set (best practice to have not more than three such parameters). Otherwise code readability decreases.  For example it is easy to make a mistake in number of commas passing optional parameters.
@@ -46,7 +45,6 @@ EndProcedure
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md b/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
index ec37e96d6c6..0b356f6fff0 100644
--- a/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
+++ b/docs/en/diagnostics/NumberOfValuesInStructureConstructor.md
@@ -1,17 +1,16 @@
 # Limit on the number of property values passed to the structure constructor (NumberOfValuesInStructureConstructor)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `10` | `standard`<br>`brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `10` | `standard`<br/>`brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxValuesCount` | `Integer` | `Allowed number parameter values passed to structure constructor` | `3`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxValuesCount` | `Integer` | ```Allowed number parameter values passed to structure constructor``` | ```3``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 When creating an object of type Structure it is not recommended to pass more than 3 property values to the constructor. Instead, it is recommended to use the Insert method or assign values to properties explicitly.
@@ -69,7 +68,6 @@ Correct:
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/OSUsersMethod.md b/docs/en/diagnostics/OSUsersMethod.md
index bd72c6231ff..6840bf248f4 100644
--- a/docs/en/diagnostics/OSUsersMethod.md
+++ b/docs/en/diagnostics/OSUsersMethod.md
@@ -1,11 +1,10 @@
 # Using method OSUsers (OSUsersMethod)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `suspicious`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Security Hotspot` | `BSL` | `Critical` | `Yes` | `15` | `suspicious` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -21,11 +20,11 @@ Source: [Pass-the-hash attack](https://en.wikipedia.org/wiki/Pass_the_hash)
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:OSUsersMethod-off // BSLLS:OSUsersMethod-on
+// BSLLS:OSUsersMethod-off
+// BSLLS:OSUsersMethod-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/ThisObjectAssign.md b/docs/en/diagnostics/ThisObjectAssign.md
index f427b60f3de..75379b64af3 100644
--- a/docs/en/diagnostics/ThisObjectAssign.md
+++ b/docs/en/diagnostics/ThisObjectAssign.md
@@ -1,11 +1,10 @@
 # ThisObject assign (ThisObjectAssign)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL` | `Blocker` | `Yes` | `1` | `error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 In managed form modules and common modules, there should not be a variable named "ThisObject".
@@ -25,7 +24,6 @@ ThisObject = FormAttributeToValue("Object");
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/TimeoutsInExternalResources.md b/docs/en/diagnostics/TimeoutsInExternalResources.md
index 544a9d91eed..11953c2b008 100644
--- a/docs/en/diagnostics/TimeoutsInExternalResources.md
+++ b/docs/en/diagnostics/TimeoutsInExternalResources.md
@@ -1,17 +1,16 @@
 # Timeouts working with external resources (TimeoutsInExternalResources)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL`<br>`OS` | `Critical` | `Yes` | `5` | `unpredictable`<br>`standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Critical` | `Yes` | `5` | `unpredictable`<br/>`standard` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`analyzeInternetMailProfileZeroTimeout` | `Boolean` | `Analyze the timeout for "InternetMailProfile"` | `true`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `analyzeInternetMailProfileZeroTimeout` | `Boolean` | ```Analyze the timeout for "InternetMailProfile"``` | ```true``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 When working with external resources using the WSDefinitions, WSProxy, HTTPConnection, FTPConnection there should be a time out - the time limit for the operation to be completed. Otherwise, as a result of endless waiting, the program will freeze or some of the functionality of the program will become unavailable.
@@ -59,7 +58,6 @@ HTTPConnection.Timeout = 1;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/TooManyReturns.md b/docs/en/diagnostics/TooManyReturns.md
index a6443a354e1..37422446894 100644
--- a/docs/en/diagnostics/TooManyReturns.md
+++ b/docs/en/diagnostics/TooManyReturns.md
@@ -1,17 +1,16 @@
 # Methods should not have too many return statements (TooManyReturns)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `No` | `20` | `brainoverload`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `No` | `20` | `brainoverload` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`maxReturnsCount` | `Integer` | `Maximum allowed return statements per method` | `3`
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `maxReturnsCount` | `Integer` | ```Maximum allowed return statements per method``` | ```3``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -37,7 +36,6 @@ Function Example(Condition)     If Condition = 1 Then         Return "Check pass
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
@@ -48,5 +46,7 @@ Function Example(Condition)     If Condition = 1 Then         Return "Check pass
 ### Parameter for config
 
 ```json
-"TooManyReturns": {     "maxReturnsCount": 3 }
+"TooManyReturns": {
+    "maxReturnsCount": 3
+}
 ```
diff --git a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
index b4a93a6a7e4..d4dab6692ac 100644
--- a/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
+++ b/docs/en/diagnostics/UnsafeSafeModeMethodCall.md
@@ -1,11 +1,10 @@
 # Unsafe SafeMode method call (UnsafeSafeModeMethodCall)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL` | `Blocker` | `Yes` | `1` | `deprecated`<br>`error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL` | `Blocker` | `Yes` | `1` | `deprecated`<br/>`error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -41,11 +40,11 @@ EndIf;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:UnsafeSafeModeMethodCall-off // BSLLS:UnsafeSafeModeMethodCall-on
+// BSLLS:UnsafeSafeModeMethodCall-off
+// BSLLS:UnsafeSafeModeMethodCall-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/UsingCancelParameter.md b/docs/en/diagnostics/UsingCancelParameter.md
index 2c1221a6a11..22ed78553e1 100644
--- a/docs/en/diagnostics/UsingCancelParameter.md
+++ b/docs/en/diagnostics/UsingCancelParameter.md
@@ -1,11 +1,10 @@
 # Using parameter "Cancel" (UsingCancelParameter)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Major` | `Yes` | `10` | `standard`<br>`badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Major` | `Yes` | `10` | `standard`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 In event handlers of object's modules, record sets, forms and etc. using parameter "Cancel" (ПриЗаписи, ОбработкаПроверкиЗаполнения, ТоварыПередНачаломДобавления and etc.) it should not be assigned value "false".  This is due to the fact, that in code of event handlers the parameter "Cancel" can be set in several consecutive checks (or in several subscriptions on the same event).In this case, by the time the next check is performed, the parameter "Cancel" can already be set to True, and you can set it to False by mistake.  In addition when modifying configuration the number of such checks can increase.
@@ -47,7 +46,6 @@ Cancel = Cancel Или ЕстьОшибкиЗаполнения();
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/UsingExternalCodeTools.md b/docs/en/diagnostics/UsingExternalCodeTools.md
index 76a0028c3d7..1032d96da81 100644
--- a/docs/en/diagnostics/UsingExternalCodeTools.md
+++ b/docs/en/diagnostics/UsingExternalCodeTools.md
@@ -1,11 +1,10 @@
 # Using external code tools (UsingExternalCodeTools)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Security Hotspot` | `BSL`<br>`OS` | `Critical` | `Yes` | `15` | `standard`<br>`design`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Security Hotspot` | `BSL`<br/>`OS` | `Critical` | `Yes` | `15` | `standard`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -35,11 +34,11 @@ At the moment, the server context is not analyzed, so diagnostic works both at c
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
-### Parameter for config
+### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:UsingExternalCodeTools-off // BSLLS:UsingExternalCodeTools-on
+// BSLLS:UsingExternalCodeTools-off
+// BSLLS:UsingExternalCodeTools-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/UsingGoto.md b/docs/en/diagnostics/UsingGoto.md
index cc8f581a76e..21703bb5f3c 100644
--- a/docs/en/diagnostics/UsingGoto.md
+++ b/docs/en/diagnostics/UsingGoto.md
@@ -1,11 +1,10 @@
 # "goto" statement should not be used (UsingGoto)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Critical` | `Yes` | `5` | `standard`<br>`badpractice`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Critical` | `Yes` | `5` | `standard`<br/>`badpractice` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 `goto` is an unstructured control flow statement. It makes code less readable and maintainable.
@@ -40,7 +39,6 @@ EndDo;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/UsingHardcodeSecretInformation.md b/docs/en/diagnostics/UsingHardcodeSecretInformation.md
index fa698407dd3..53ddc7cd79b 100644
--- a/docs/en/diagnostics/UsingHardcodeSecretInformation.md
+++ b/docs/en/diagnostics/UsingHardcodeSecretInformation.md
@@ -1,17 +1,16 @@
 # Storing confidential information in code (UsingHardcodeSecretInformation)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Vulnerability` | `BSL` | `Critical` | `Yes` | `15` | `standard`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Vulnerability` | `BSL` | `Critical` | `Yes` | `15` | `standard` |
 
-## Parameters
+## Parameters 
 
-Name | Type | Description | Default value
-:-: | :-: | :-- | :-:
-`searchWords` | `String` | `Search keywords for confidential information in variables. structures, mappings.` | ```Пароль
+| Name | Type | Description | Default value |
+| :-: | :-: | :-- | :-: |
+| `searchWords` | `String` | ```Search keywords for confidential information in variables, structures, mappings.``` | ```Пароль|Password``` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 It is prohibited to store any confidential information in the code. The confidential information is:
@@ -51,7 +50,6 @@ Password = Passwords.Password;
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md
index 831046c6cc2..627d965dc73 100644
--- a/docs/en/diagnostics/index.md
+++ b/docs/en/diagnostics/index.md
@@ -10,121 +10,121 @@ To escape individual sections of code or files from triggering diagnostics, you
 
 Total: **111**
 
-- Code smell: **70**
-- Vulnerability: **3**
-- Error: **34**
-- Security Hotspot: **4**
+* Error: **34**
+* Code smell: **70**
+* Vulnerability: **3**
+* Security Hotspot: **4**
 
-Key | Name | Enabled by default | Severity | Type | Tags
---- | --- | :-: | --- | --- | ---
-[BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Violating transaction rules for the 'BeginTransaction' method | Yes | Major | Error | `standard`
-[CachedPublic](CachedPublic.md) | Cached public methods | Yes | Major | Code smell | `standard`<br>`design`
-[CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Canonical keyword writing | Yes | Info | Code smell | `standard`
-[CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Method definitions must be placed before the module body operators | Yes | Blocker | Error | `error`
-[CodeOutOfRegion](CodeOutOfRegion.md) | Code out of region | Yes | Info | Code smell | `standard`
-[CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload`
-[CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br>`badpractice`
-[CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard`
-[CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error`
-[CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br>`unpredictable`<br>`design`
-[CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
-[CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
-[CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
-[CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br>`badpractice`<br>`unpredictable`
-[CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`brainoverload`
-[CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard`
-[CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br>`badpractice`<br>`unpredictable`
-[CommonModuleNameWords](CommonModuleNameWords.md) | Unrecommended common module name | Yes | Info | Code smell | `standard`
-[CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br>`unpredictable`
-[CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br>`standard`<br>`unpredictable`
-[ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice`
-[CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance`
-[CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload`
-[DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br>`badpractice`<br>`unpredictable`
-[DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br>`error`
-[DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated`
-[DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br>`deprecated`<br>`unpredictable`
-[DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated`
-[DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br>`deprecated`
-[DeprecatedMethodCall](DeprecatedMethodCall.md) | Deprecated methods should not be used | Yes | Minor | Code smell | `deprecated`<br>`design`
-[DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated`
-[DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated`
-[DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br>`deprecated`
-[DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard`
-[EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br>`suspicious`
-[EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard`
-[EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice`
-[ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br>`deprecated`
-[ExecuteExternalCode](ExecuteExternalCode.md) | Executing of external code on the server | Yes | Critical | Vulnerability | `error`<br>`standard`
-[ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Executing of external code in a common module on the server | Yes | Critical | Security Hotspot | `badpractice`<br>`standard`
-[ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br>`badpractice`
-[FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice`
-[FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard`
-[FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br>`badpractice`
-[FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br>`unpredictable`
-[GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error`
-[IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious`
-[IfConditionComplexity](IfConditionComplexity.md) | Usage of complex expressions in the "If" condition | Yes | Minor | Code smell | `brainoverload`
-[IfElseDuplicatedCodeBlock](IfElseDuplicatedCodeBlock.md) | Duplicated code blocks in If...Then...ElseIf... statements | Yes | Minor | Code smell | `suspicious`
-[IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious`
-[IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice`
-[InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br>`standard`<br>`unpredictable`
-[IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error`
-[LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br>`badpractice`
-[MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice`
-[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`<br>`badpractice`
-[MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice`
-[MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br>`standard`
-[MissingVariablesDescription](MissingVariablesDescription.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard`
-[MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br>`localize`
-[MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br>`localize`
-[NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br>`brainoverload`
-[NestedFunctionInParameters](NestedFunctionInParameters.md) | Initialization of method and constructor parameters by calling nested methods | Yes | Minor | Code smell | `standard`<br>`brainoverload`<br>`badpractice`
-[NestedStatements](NestedStatements.md) | Control flow statements should not be nested too deep | Yes | Critical | Code smell | `badpractice`<br>`brainoverload`
-[NestedTernaryOperator](NestedTernaryOperator.md) | Nested ternary operator | Yes | Major | Code smell | `brainoverload`
-[NonExportMethodsInApiRegion](NonExportMethodsInApiRegion.md) | Non export methods in API regions | Yes | Major | Code smell | `standard`
-[NonStandardRegion](NonStandardRegion.md) | Non-standard region of module | Yes | Info | Code smell | `standard`
-[NumberOfOptionalParams](NumberOfOptionalParams.md) | Limit number of optional parameters in method | Yes | Minor | Code smell | `standard`<br>`brainoverload`
-[NumberOfParams](NumberOfParams.md) | Number of parameters in method | Yes | Minor | Code smell | `standard`<br>`brainoverload`
-[NumberOfValuesInStructureConstructor](NumberOfValuesInStructureConstructor.md) | Limit on the number of property values passed to the structure constructor | Yes | Minor | Code smell | `standard`<br>`brainoverload`
-[OSUsersMethod](OSUsersMethod.md) | Using method OSUsers | Yes | Critical | Security Hotspot | `suspicious`
-[OneStatementPerLine](OneStatementPerLine.md) | One statement per line | Yes | Minor | Code smell | `standard`<br>`design`
-[OrderOfParams](OrderOfParams.md) | Order of Parameters in method | Yes | Major | Code smell | `standard`<br>`design`
-[PairingBrokenTransaction](PairingBrokenTransaction.md) | Violation of pairing using methods "BeginTransaction()" & "CommitTransaction()" / "RollbackTransaction()" | Yes | Major | Error | `standard`
-[ParseError](ParseError.md) | Source code parse error | Yes | Critical | Error | `error`
-[ProcedureReturnsValue](ProcedureReturnsValue.md) | Procedure should not return Value | Yes | Blocker | Error | `error`
-[PublicMethodsDescription](PublicMethodsDescription.md) | All public methods must have a description | Yes | Info | Code smell | `standard`<br>`brainoverload`<br>`badpractice`
-[SelfAssign](SelfAssign.md) | Variable is assigned to itself | Yes | Major | Error | `suspicious`
-[SelfInsertion](SelfInsertion.md) | Insert a collection into itself | Yes | Major | Error | `standard`<br>`unpredictable`<br>`performance`
-[SemicolonPresence](SemicolonPresence.md) | Statement should end with semicolon symbol ";" | Yes | Minor | Code smell | `standard`<br>`badpractice`
-[SeveralCompilerDirectives](SeveralCompilerDirectives.md) | Erroneous indication of several compilation directives | Yes | Critical | Error | `unpredictable`<br>`error`
-[SpaceAtStartComment](SpaceAtStartComment.md) | Space at the beginning of the comment | Yes | Info | Code smell | `standard`
-[TempFilesDir](TempFilesDir.md) | TempFilesDir() method call | Yes | Major | Code smell | `standard`<br>`badpractice`
-[TernaryOperatorUsage](TernaryOperatorUsage.md) | Ternary operator usage | No | Minor | Code smell | `brainoverload`
-[ThisObjectAssign](ThisObjectAssign.md) | ThisObject assign | Yes | Blocker | Error | `error`
-[TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Timeouts working with external resources | Yes | Critical | Error | `unpredictable`<br>`standard`
-[TooManyReturns](TooManyReturns.md) | Methods should not have too many return statements | No | Minor | Code smell | `brainoverload`
-[TryNumber](TryNumber.md) | Cast to number of try catch block | Yes | Major | Code smell | `standard`
-[Typo](Typo.md) | Typo | Yes | Info | Code smell | `badpractice`
-[UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br>`brainoverload`
-[UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br>`error`
-[UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br>`suspicious`
-[UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `deprecated`<br>`error`
-[UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br>`suspicious`
-[UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design`
-[UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy`
-[UsingCancelParameter](UsingCancelParameter.md) | Using parameter "Cancel" | Yes | Major | Code smell | `standard`<br>`badpractice`
-[UsingExternalCodeTools](UsingExternalCodeTools.md) | Using external code tools | Yes | Critical | Security Hotspot | `standard`<br>`design`
-[UsingFindElementByString](UsingFindElementByString.md) | Using FindByName and FindByCode | Yes | Major | Code smell | `standard`<br>`badpractice`<br>`performance`
-[UsingGoto](UsingGoto.md) | "goto" statement should not be used | Yes | Critical | Code smell | `standard`<br>`badpractice`
-[UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Using hardcode ip addresses in code | Yes | Critical | Vulnerability | `standard`
-[UsingHardcodePath](UsingHardcodePath.md) | Using hardcode file paths in code | Yes | Critical | Error | `standard`
-[UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Storing confidential information in code | Yes | Critical | Vulnerability | `standard`
-[UsingModalWindows](UsingModalWindows.md) | Using modal windows | Yes | Major | Code smell | `standard`
-[UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Using unavailable in Unix objects | Yes | Critical | Error | `standard`<br>`lockinos`
-[UsingServiceTag](UsingServiceTag.md) | Using service tags | Yes | Info | Code smell | `badpractice`
-[UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | Yes | Major | Code smell | `standard`
-[UsingThisForm](UsingThisForm.md) | Using deprecated property "ThisForm" | Yes | Minor | Code smell | `standard`<br>`deprecated`
-[WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Not recommended using of RollbackTransaction method | Yes | Critical | Error | `standard`
-[YoLetterUsage](YoLetterUsage.md) | Using Russian character "yo" ("ё") in code | Yes | Info | Code smell | `standard`
+| Key | Name| Enabled by default | Severity | Type | Tags |
+| --- | --- | :-: | --- | --- | --- |
+| [BeginTransactionBeforeTryCatch](BeginTransactionBeforeTryCatch.md) | Violating transaction rules for the 'BeginTransaction' method | Yes | Major | Error | `standard` |
+| [CachedPublic](CachedPublic.md) | Cached public methods | Yes | Major | Code smell | `standard`<br/>`design` |
+| [CanonicalSpellingKeywords](CanonicalSpellingKeywords.md) | Canonical keyword writing | Yes | Info | Code smell | `standard` |
+| [CodeBlockBeforeSub](CodeBlockBeforeSub.md) | Method definitions must be placed before the module body operators | Yes | Blocker | Error | `error` |
+| [CodeOutOfRegion](CodeOutOfRegion.md) | Code out of region | Yes | Info | Code smell | `standard` |
+| [CognitiveComplexity](CognitiveComplexity.md) | Cognitive complexity | Yes | Critical | Code smell | `brainoverload` |
+| [CommentedCode](CommentedCode.md) | Commented out code | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
+| [CommitTransactionOutsideTryCatch](CommitTransactionOutsideTryCatch.md) | Violating transaction rules for the 'CommitTransaction' method | Yes | Major | Error | `standard` |
+| [CommonModuleAssign](CommonModuleAssign.md) | CommonModuleAssign | Yes | Blocker | Error | `error` |
+| [CommonModuleInvalidType](CommonModuleInvalidType.md) | Common module invalid type | Yes | Major | Error | `standard`<br/>`unpredictable`<br/>`design` |
+| [CommonModuleNameCached](CommonModuleNameCached.md) | Missed postfix "Cached" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClient](CommonModuleNameClient.md) | Missed postfix "Client" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameClientServer](CommonModuleNameClientServer.md) | Missed postfix "ClientServer" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameFullAccess](CommonModuleNameFullAccess.md) | Missed postfix "FullAccess" | Yes | Major | Security Hotspot | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameGlobal](CommonModuleNameGlobal.md) | Missed postfix "Global" | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`brainoverload` |
+| [CommonModuleNameGlobalClient](CommonModuleNameGlobalClient.md) | Global module with postfix "Client" | Yes | Major | Code smell | `standard` |
+| [CommonModuleNameServerCall](CommonModuleNameServerCall.md) | Missed postfix "ServerCall" | Yes | Minor | Code smell | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [CommonModuleNameWords](CommonModuleNameWords.md) | Unrecommended common module name | Yes | Info | Code smell | `standard` |
+| [CompilationDirectiveLost](CompilationDirectiveLost.md) | Methods compilation directive | Yes | Major | Code smell | `standard`<br/>`unpredictable` |
+| [CompilationDirectiveNeedLess](CompilationDirectiveNeedLess.md) | Needless compilation directive | Yes | Major | Code smell | `clumsy`<br/>`standard`<br/>`unpredictable` |
+| [ConsecutiveEmptyLines](ConsecutiveEmptyLines.md) | Consecutive empty lines | Yes | Info | Code smell | `badpractice` |
+| [CreateQueryInCycle](CreateQueryInCycle.md) | Execution query on cycle | Yes | Critical | Error | `performance` |
+| [CyclomaticComplexity](CyclomaticComplexity.md) | Cyclomatic complexity | Yes | Critical | Code smell | `brainoverload` |
+| [DataExchangeLoading](DataExchangeLoading.md) | There is no check for the attribute DataExchange.Load in the object's event handler | Yes | Critical | Error | `standard`<br/>`badpractice`<br/>`unpredictable` |
+| [DeletingCollectionItem](DeletingCollectionItem.md) | Deleting an item when iterating through collection using the operator "For each ... In ... Do" | Yes | Major | Error | `standard`<br/>`error` |
+| [DeprecatedAttributes8312](DeprecatedAttributes8312.md) | Deprecated 8.3.12 platform features. | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedCurrentDate](DeprecatedCurrentDate.md) | Using of the deprecated method "CurrentDate" | Yes | Major | Error | `standard`<br/>`deprecated`<br/>`unpredictable` |
+| [DeprecatedFind](DeprecatedFind.md) | Using of the deprecated method "Find" | Yes | Minor | Code smell | `deprecated` |
+| [DeprecatedMessage](DeprecatedMessage.md) | Restriction on the use of deprecated "Message" method | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [DeprecatedMethodCall](DeprecatedMethodCall.md) | Deprecated methods should not be used | Yes | Minor | Code smell | `deprecated`<br/>`design` |
+| [DeprecatedMethods8310](DeprecatedMethods8310.md) | Deprecated client application method. | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedMethods8317](DeprecatedMethods8317.md) | Using of deprecated platform 8.3.17 global methods | Yes | Info | Code smell | `deprecated` |
+| [DeprecatedTypeManagedForm](DeprecatedTypeManagedForm.md) | Deprecated ManagedForm type | Yes | Info | Code smell | `standard`<br/>`deprecated` |
+| [DuplicateRegion](DuplicateRegion.md) | Duplicate regions | Yes | Info | Code smell | `standard` |
+| [EmptyCodeBlock](EmptyCodeBlock.md) | Empty code block | Yes | Major | Code smell | `badpractice`<br/>`suspicious` |
+| [EmptyRegion](EmptyRegion.md) | The region should not be empty | Yes | Info | Code smell | `standard` |
+| [EmptyStatement](EmptyStatement.md) | Empty statement | Yes | Info | Code smell | `badpractice` |
+| [ExcessiveAutoTestCheck](ExcessiveAutoTestCheck.md) | Excessive AutoTest Check | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [ExecuteExternalCode](ExecuteExternalCode.md) | Executing of external code on the server | Yes | Critical | Vulnerability | `error`<br/>`standard` |
+| [ExecuteExternalCodeInCommonModule](ExecuteExternalCodeInCommonModule.md) | Executing of external code in a common module on the server | Yes | Critical | Security Hotspot | `badpractice`<br/>`standard` |
+| [ExtraCommas](ExtraCommas.md) | Commas without a parameter at the end of a method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
+| [FormDataToValue](FormDataToValue.md) | FormDataToValue method call | Yes | Info | Code smell | `badpractice` |
+| [FunctionNameStartsWithGet](FunctionNameStartsWithGet.md) | Function name shouldn't start with "Получить" | No | Info | Code smell | `standard` |
+| [FunctionReturnsSamePrimitive](FunctionReturnsSamePrimitive.md) | The function always returns the same primitive value | Yes | Major | Error | `design`<br/>`badpractice` |
+| [FunctionShouldHaveReturn](FunctionShouldHaveReturn.md) | The function should have return | Yes | Major | Error | `suspicious`<br/>`unpredictable` |
+| [GetFormMethod](GetFormMethod.md) | GetForm method call | Yes | Major | Error | `error` |
+| [IdenticalExpressions](IdenticalExpressions.md) | There are identical sub-expressions to the left and to the right of the "foo" operator | Yes | Major | Error | `suspicious` |
+| [IfConditionComplexity](IfConditionComplexity.md) | Usage of complex expressions in the "If" condition | Yes | Minor | Code smell | `brainoverload` |
+| [IfElseDuplicatedCodeBlock](IfElseDuplicatedCodeBlock.md) | Duplicated code blocks in If...Then...ElseIf... statements | Yes | Minor | Code smell | `suspicious` |
+| [IfElseDuplicatedCondition](IfElseDuplicatedCondition.md) | Duplicated conditions in If...Then...ElseIf... statements | Yes | Major | Code smell | `suspicious` |
+| [IfElseIfEndsWithElse](IfElseIfEndsWithElse.md) | Else...The...ElseIf... statement should end with Else branch | Yes | Major | Code smell | `badpractice` |
+| [InvalidCharacterInFile](InvalidCharacterInFile.md) | Invalid character | Yes | Major | Error | `error`<br/>`standard`<br/>`unpredictable` |
+| [IsInRoleMethodDiagnostic](IsInRoleMethodDiagnostic.md) | IsInRole global method call | Yes | Major | Code smell | `error` |
+| [LineLength](LineLength.md) | Line Length limit | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
+| [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` |
+| [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`<br/>`badpractice` |
+| [MissingSpace](MissingSpace.md) | Missing spaces to the left or right of operators + - * / = % < > <> <= >=, and also to the right of , and ; | Yes | Info | Code smell | `badpractice` |
+| [MissingTemporaryFileDeletion](MissingTemporaryFileDeletion.md) | Missing temporary file deletion after using | Yes | Major | Error | `badpractice`<br/>`standard` |
+| [MissingVariablesDescription](MissingVariablesDescription.md) | All variables declarations must have a description | Yes | Minor | Code smell | `standard` |
+| [MultilingualStringHasAllDeclaredLanguages](MultilingualStringHasAllDeclaredLanguages.md) | There is a localized text for all languages declared in the configuration | Yes | Minor | Error | `error`<br/>`localize` |
+| [MultilingualStringUsingWithTemplate](MultilingualStringUsingWithTemplate.md) | Partially localized text is used in the StrTemplate function | Yes | Major | Error | `error`<br/>`localize` |
+| [NestedConstructorsInStructureDeclaration](NestedConstructorsInStructureDeclaration.md) | Nested constructors with parameters in structure declaration | Yes | Minor | Code smell | `badpractice`<br/>`brainoverload` |
+| [NestedFunctionInParameters](NestedFunctionInParameters.md) | Initialization of method and constructor parameters by calling nested methods | Yes | Minor | Code smell | `standard`<br/>`brainoverload`<br/>`badpractice` |
+| [NestedStatements](NestedStatements.md) | Control flow statements should not be nested too deep | Yes | Critical | Code smell | `badpractice`<br/>`brainoverload` |
+| [NestedTernaryOperator](NestedTernaryOperator.md) | Nested ternary operator | Yes | Major | Code smell | `brainoverload` |
+| [NonExportMethodsInApiRegion](NonExportMethodsInApiRegion.md) | Non export methods in API regions | Yes | Major | Code smell | `standard` |
+| [NonStandardRegion](NonStandardRegion.md) | Non-standard region of module | Yes | Info | Code smell | `standard` |
+| [NumberOfOptionalParams](NumberOfOptionalParams.md) | Limit number of optional parameters in method | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
+| [NumberOfParams](NumberOfParams.md) | Number of parameters in method | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
+| [NumberOfValuesInStructureConstructor](NumberOfValuesInStructureConstructor.md) | Limit on the number of property values passed to the structure constructor | Yes | Minor | Code smell | `standard`<br/>`brainoverload` |
+| [OSUsersMethod](OSUsersMethod.md) | Using method OSUsers | Yes | Critical | Security Hotspot | `suspicious` |
+| [OneStatementPerLine](OneStatementPerLine.md) | One statement per line | Yes | Minor | Code smell | `standard`<br/>`design` |
+| [OrderOfParams](OrderOfParams.md) | Order of Parameters in method | Yes | Major | Code smell | `standard`<br/>`design` |
+| [PairingBrokenTransaction](PairingBrokenTransaction.md) | Violation of pairing using methods "BeginTransaction()" & "CommitTransaction()" / "RollbackTransaction()" | Yes | Major | Error | `standard` |
+| [ParseError](ParseError.md) | Source code parse error | Yes | Critical | Error | `error` |
+| [ProcedureReturnsValue](ProcedureReturnsValue.md) | Procedure should not return Value | Yes | Blocker | Error | `error` |
+| [PublicMethodsDescription](PublicMethodsDescription.md) | All public methods must have a description | Yes | Info | Code smell | `standard`<br/>`brainoverload`<br/>`badpractice` |
+| [SelfAssign](SelfAssign.md) | Variable is assigned to itself | Yes | Major | Error | `suspicious` |
+| [SelfInsertion](SelfInsertion.md) | Insert a collection into itself | Yes | Major | Error | `standard`<br/>`unpredictable`<br/>`performance` |
+| [SemicolonPresence](SemicolonPresence.md) | Statement should end with semicolon symbol ";" | Yes | Minor | Code smell | `standard`<br/>`badpractice` |
+| [SeveralCompilerDirectives](SeveralCompilerDirectives.md) | Erroneous indication of several compilation directives | Yes | Critical | Error | `unpredictable`<br/>`error` |
+| [SpaceAtStartComment](SpaceAtStartComment.md) | Space at the beginning of the comment | Yes | Info | Code smell | `standard` |
+| [TempFilesDir](TempFilesDir.md) | TempFilesDir() method call | Yes | Major | Code smell | `standard`<br/>`badpractice` |
+| [TernaryOperatorUsage](TernaryOperatorUsage.md) | Ternary operator usage | No | Minor | Code smell | `brainoverload` |
+| [ThisObjectAssign](ThisObjectAssign.md) | ThisObject assign | Yes | Blocker | Error | `error` |
+| [TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Timeouts working with external resources | Yes | Critical | Error | `unpredictable`<br/>`standard` |
+| [TooManyReturns](TooManyReturns.md) | Methods should not have too many return statements | No | Minor | Code smell | `brainoverload` |
+| [TryNumber](TryNumber.md) | Cast to number of try catch block | Yes | Major | Code smell | `standard` |
+| [Typo](Typo.md) | Typo | Yes | Info | Code smell | `badpractice` |
+| [UnaryPlusInConcatenation](UnaryPlusInConcatenation.md) | Unary Plus sign in string concatenation | Yes | Blocker | Error | `suspicious`<br/>`brainoverload` |
+| [UnknownPreprocessorSymbol](UnknownPreprocessorSymbol.md) | Unknown preprocessor symbol | Yes | Critical | Error | `standard`<br/>`error` |
+| [UnreachableCode](UnreachableCode.md) | Unreachable Code | Yes | Minor | Error | `design`<br/>`suspicious` |
+| [UnsafeSafeModeMethodCall](UnsafeSafeModeMethodCall.md) | Unsafe SafeMode method call | Yes | Blocker | Error | `deprecated`<br/>`error` |
+| [UnusedLocalMethod](UnusedLocalMethod.md) | Unused local method | Yes | Major | Code smell | `standard`<br/>`suspicious` |
+| [UnusedParameters](UnusedParameters.md) | Unused parameter | Yes | Major | Code smell | `design` |
+| [UseLessForEach](UseLessForEach.md) | Useless collection iteration | Yes | Critical | Error | `clumsy` |
+| [UsingCancelParameter](UsingCancelParameter.md) | Using parameter "Cancel" | Yes | Major | Code smell | `standard`<br/>`badpractice` |
+| [UsingExternalCodeTools](UsingExternalCodeTools.md) | Using external code tools | Yes | Critical | Security Hotspot | `standard`<br/>`design` |
+| [UsingFindElementByString](UsingFindElementByString.md) | Using FindByName and FindByCode | Yes | Major | Code smell | `standard`<br/>`badpractice`<br/>`performance` |
+| [UsingGoto](UsingGoto.md) | "goto" statement should not be used | Yes | Critical | Code smell | `standard`<br/>`badpractice` |
+| [UsingHardcodeNetworkAddress](UsingHardcodeNetworkAddress.md) | Using hardcode ip addresses in code | Yes | Critical | Vulnerability | `standard` |
+| [UsingHardcodePath](UsingHardcodePath.md) | Using hardcode file paths in code | Yes | Critical | Error | `standard` |
+| [UsingHardcodeSecretInformation](UsingHardcodeSecretInformation.md) | Storing confidential information in code | Yes | Critical | Vulnerability | `standard` |
+| [UsingModalWindows](UsingModalWindows.md) | Using modal windows | Yes | Major | Code smell | `standard` |
+| [UsingObjectNotAvailableUnix](UsingObjectNotAvailableUnix.md) | Using unavailable in Unix objects | Yes | Critical | Error | `standard`<br/>`lockinos` |
+| [UsingServiceTag](UsingServiceTag.md) | Using service tags | Yes | Info | Code smell | `badpractice` |
+| [UsingSynchronousCalls](UsingSynchronousCalls.md) | Using synchronous calls | Yes | Major | Code smell | `standard` |
+| [UsingThisForm](UsingThisForm.md) | Using deprecated property "ThisForm" | Yes | Minor | Code smell | `standard`<br/>`deprecated` |
+| [WrongUseOfRollbackTransactionMethod](WrongUseOfRollbackTransactionMethod.md) | Not recommended using of RollbackTransaction method | Yes | Critical | Error | `standard` |
+| [YoLetterUsage](YoLetterUsage.md) | Using Russian character "yo" ("ё") in code | Yes | Info | Code smell | `standard` |
\ No newline at end of file

From 78b23078e04059e2d6118ec8e3f283fc78161254 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sun, 24 May 2020 14:18:48 +0300
Subject: [PATCH 417/444] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=86=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BC=D0=BE=D1=82=D1=80=D0=B0=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=D0=BA=20=D0=BD=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=85=20visitSomething?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractCommonModuleNameDiagnostic.java          |  3 +--
 .../diagnostics/AbstractDiagnostic.java              |  6 ++++--
 .../diagnostics/CachedPublicDiagnostic.java          |  2 +-
 .../CanonicalSpellingKeywordsDiagnostic.java         |  2 +-
 .../diagnostics/CommentedCodeDiagnostic.java         |  9 ++-------
 .../diagnostics/ConsecutiveEmptyLinesDiagnostic.java |  2 +-
 .../InvalidCharacterInFileDiagnostic.java            |  8 ++------
 .../diagnostics/LineLengthDiagnostic.java            |  3 +--
 .../diagnostics/MissingSpaceDiagnostic.java          |  8 ++------
 .../diagnostics/NonStandardRegionDiagnostic.java     | 12 ++++--------
 .../languageserver/diagnostics/TypoDiagnostic.java   |  2 +-
 .../diagnostics/YoLetterUsageDiagnostic.java         |  3 +--
 12 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
index 25616ecf4bb..3a3c574e686 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractCommonModuleNameDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.mdclasses.mdo.CommonModule;
 import com.github._1c_syntax.mdclasses.mdo.MDObjectBase;
@@ -40,7 +39,7 @@ public AbstractCommonModuleNameDiagnostic(DiagnosticInfo info, String regexp) {
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
     if (documentContext.getTokensFromDefaultChannel().isEmpty()) {
       return;
     }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
index f175f8a24ad..10aef1e11a0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnostic.java
@@ -31,6 +31,7 @@ public abstract class AbstractDiagnostic implements BSLDiagnostic {
 
   protected final DiagnosticInfo info;
   protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
+  protected DocumentContext documentContext;
 
   public AbstractDiagnostic(DiagnosticInfo info) {
     this.info = info;
@@ -43,10 +44,11 @@ public DiagnosticInfo getInfo() {
 
   @Override
   public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
+    this.documentContext = documentContext;
     diagnosticStorage.clearDiagnostics();
-    check(documentContext);
+    check();
     return diagnosticStorage.getDiagnostics();
   }
 
-  protected abstract void check(DocumentContext documentContext);
+  protected abstract void check();
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
index a93af83fa33..dec1cc54386 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java
@@ -60,7 +60,7 @@ public CachedPublicDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
 
     if (!isCashed(documentContext)) {
       return;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
index 3fa75f80ce0..a8be15f0275 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CanonicalSpellingKeywordsDiagnostic.java
@@ -269,7 +269,7 @@ private static Map<String, String> getCanonical() {
     return result;
   }
 
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
     documentContext.getTokensFromDefaultChannel()
       .parallelStream()
       .filter((Token t) ->
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommentedCodeDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommentedCodeDiagnostic.java
index ef6b30fdf45..fb20ff2e750 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommentedCodeDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommentedCodeDiagnostic.java
@@ -56,7 +56,7 @@
     DiagnosticTag.BADPRACTICE
   }
 )
-public class CommentedCodeDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
+public class CommentedCodeDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
   private static final float COMMENTED_CODE_THRESHOLD = 0.9F;
   private static final String COMMENT_START = "//";
@@ -86,10 +86,7 @@ public void configure(Map<String, Object> configuration) {
   }
 
   @Override
-  public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
-    this.documentContext = documentContext;
-    diagnosticStorage.clearDiagnostics();
-
+  public void check() {
     methodDescriptions = documentContext.getSymbolTree().getMethods()
       .stream()
       .map(MethodSymbol::getDescription)
@@ -101,8 +98,6 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
       .stream()
       .filter(this::isCommentGroupNotMethodDescription)
       .forEach(this::checkCommentGroup);
-
-    return diagnosticStorage.getDiagnostics();
   }
 
   private List<List<Token>> groupComments(List<Token> comments) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
index 8edb2e76bad..4125820d7f5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ConsecutiveEmptyLinesDiagnostic.java
@@ -64,7 +64,7 @@ public ConsecutiveEmptyLinesDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
 
     final var tokens = documentContext.getTokens();
     if (tokens.isEmpty()){
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
index feb2f8cd370..c0523b55a44 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/InvalidCharacterInFileDiagnostic.java
@@ -29,10 +29,8 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
-import com.github._1c_syntax.bsl.parser.BSLParser;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.Diagnostic;
@@ -54,7 +52,7 @@
   }
 )
 
-public class InvalidCharacterInFileDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
+public class InvalidCharacterInFileDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
   public static final String SPACE_REGEX = "(?:" +
     "\\u00A0" + // 160
@@ -84,7 +82,7 @@ public InvalidCharacterInFileDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  public ParseTree visitFile(BSLParser.FileContext ctx) {
+  public void check() {
 
     documentContext
       .getTokens()
@@ -106,8 +104,6 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
           diagnosticStorage.addDiagnostic(token, message);
         }
       );
-
-    return ctx;
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
index b4c4b1a6f11..59d507f27c8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/LineLengthDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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.DiagnosticParameter;
@@ -63,7 +62,7 @@ public LineLengthDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
     tokensInOneLine.clear();
 
     documentContext.getTokensFromDefaultChannel().forEach((Token token) -> {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
index 68f49db782b..fcb374ebb51 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
@@ -54,7 +54,7 @@
     DiagnosticTag.BADPRACTICE
   }
 )
-public class MissingSpaceDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
+public class MissingSpaceDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
   // символы, требующие пробелы только слева
   private static final String DEFAULT_LIST_FOR_CHECK_LEFT = "";
@@ -152,14 +152,12 @@ private static Pattern compilePattern(String string) {
   }
 
   @Override
-  public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
+  public void check() {
 
     sampleMessage[INDEX_WORD_LEFT] = info.getResourceString("wordLeft");               // "Слева"
     sampleMessage[INDEX_WORD_RIGHT] = info.getResourceString("wordRight");             // "Справа"
     sampleMessage[INDEX_WORD_LEFT_RIGHT] = info.getResourceString("wordLeftAndRight"); // "Слева и справа"
 
-    diagnosticStorage.clearDiagnostics();
-
     List<Token> tokens = documentContext.getTokens();
     List<Token> foundTokens;
 
@@ -208,8 +206,6 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
         );
 
     }
-
-    return diagnosticStorage.getDiagnostics();
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
index 8d3ec5a95d3..cdb159d46b2 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
@@ -30,9 +30,7 @@
 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.utils.Keywords;
-import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
-import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Collections;
 import java.util.EnumMap;
@@ -52,7 +50,7 @@
     DiagnosticTag.STANDARD
   }
 )
-public class NonStandardRegionDiagnostic extends AbstractVisitorDiagnostic {
+public class NonStandardRegionDiagnostic extends AbstractDiagnostic {
 
   private static final Pattern PUBLIC_REGION_NAME =
     createPattern(Keywords.PUBLIC_REGION_RU, Keywords.PUBLIC_REGION_EN);
@@ -179,14 +177,14 @@ private static Pattern createPattern(String keywordRu, String keywordEn, String
   }
 
   @Override
-  public ParseTree visitFile(BSLParser.FileContext ctx) {
+  public void check() {
 
     // нет смысла говорить о стандартах для неизвестных модулях
     Set<Pattern> standardRegions = standardRegionsByModuleType.getOrDefault(
       documentContext.getModuleType(), Collections.emptySet());
 
     if (standardRegions.isEmpty()) {
-      return ctx;
+      return;
     }
 
     List<RegionSymbol> regions = documentContext.getSymbolTree().getModuleLevelRegions();
@@ -194,7 +192,7 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
     // чтобы не было лишних FP, анализировать модуль без областей не будем
     // вешать диагностику тож не будем, пусть вешается "CodeOutOfRegionDiagnostic"
     if (regions.isEmpty()) {
-      return ctx;
+      return;
     }
 
     // проверим, что область находится в списке доступных
@@ -206,7 +204,5 @@ public ParseTree visitFile(BSLParser.FileContext ctx) {
         );
       }
     });
-
-    return ctx;
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic.java
index befe22bee9f..80de9a4ccdb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TypoDiagnostic.java
@@ -154,7 +154,7 @@ private String getTokenizedStringFromTokens(DocumentContext documentContext, Map
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
 
     String lang = info.getResourceString("diagnosticLanguage");
     Map<String, List<Token>> tokensMap = new HashMap<>();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
index df6c59f223d..2d2fed1efc7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/YoLetterUsageDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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;
@@ -47,7 +46,7 @@ public YoLetterUsageDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  protected void check(DocumentContext documentContext) {
+  protected void check() {
     documentContext.getTokensFromDefaultChannel()
       .parallelStream()
       .filter((Token t) ->

From 575250003e1d6b4beaaf9f87ef1d78b3be8a1d9a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 25 May 2020 10:20:44 +0300
Subject: [PATCH 418/444] =?UTF-8?q?#1210=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BB=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UsingFindElementByStringDiagnostic.java     | 2 +-
 .../diagnostics/UsingFindElementByStringDiagnosticTest.java | 6 ++++--
 .../diagnostics/UsingFindElementByStringDiagnostic.bsl      | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
index f071145c91d..7dc290b06ad 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
@@ -66,7 +66,7 @@ public ParseTree visitMethodCall(BSLParser.MethodCallContext ctx) {
         diagnosticStorage.addDiagnostic(ctx, info.getMessage(matcher.group(0)));
       }
     }
-    return ctx;
+    return super.visitMethodCall(ctx);
   }
 
 }
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnosticTest.java
index 48d443c3f47..e1b4d94ef11 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnosticTest.java
@@ -42,13 +42,15 @@ void runTest() {
     List<Diagnostic> diagnostics = getDiagnostics();
 
     // then
-    assertThat(diagnostics).hasSize(5);
+    assertThat(diagnostics).hasSize(6);
     assertThat(diagnostics, true)
       .hasRange(7, 38, 7, 78)
       .hasRange(9, 40, 9, 61)
       .hasRange(13, 27, 13, 59)
       .hasRange(24, 35, 24, 53)
-      .hasRange(27, 35, 27, 51);
+      .hasRange(27, 35, 27, 51)
+      .hasRange(30, 27, 30, 53)
+    ;
 
   }
 
diff --git a/src/test/resources/diagnostics/UsingFindElementByStringDiagnostic.bsl b/src/test/resources/diagnostics/UsingFindElementByStringDiagnostic.bsl
index ae180021d18..2f6d4784cac 100644
--- a/src/test/resources/diagnostics/UsingFindElementByStringDiagnostic.bsl
+++ b/src/test/resources/diagnostics/UsingFindElementByStringDiagnostic.bsl
@@ -27,4 +27,7 @@
     // Сработает
     Значение2 = Справочники.Валюты.НайтиПоКоду(777);
 
+    А = Справочники.Валюты.Функция(
+        Справочники.Валюты.НайтиПоНаименованию("777") // сработает
+    );
 КонецПроцедуры
\ No newline at end of file

From aa46e9b2cbf19d7c7349e2b7fbc6f218e7f7d9e5 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 25 May 2020 10:24:17 +0300
Subject: [PATCH 419/444] =?UTF-8?q?#1211=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=80=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B6=D0=B5=D0=B1=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NonExportMethodsInApiRegionDiagnostic.java           | 6 +++---
 .../NonExportMethodsInApiRegionDiagnosticTest.java       | 3 ++-
 .../NonExportMethodsInApiRegionDiagnostic.bsl            | 9 ++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
index 0e7e897d1c8..78b2beabdb8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnostic.java
@@ -29,6 +29,7 @@
 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.regex.Pattern;
@@ -43,9 +44,8 @@
 )
 public class NonExportMethodsInApiRegionDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern REGION_NAME = Pattern.compile(
-    "^(?:ПрограммныйИнтерфейс|СлужебныйПрограмныйИнтерфейс|Public|Internal)$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern REGION_NAME = CaseInsensitivePattern.compile(
+    "^(?:ПрограммныйИнтерфейс|СлужебныйПрограммныйИнтерфейс|Public|Internal)$"
   );
 
   public NonExportMethodsInApiRegionDiagnostic(DiagnosticInfo info) {
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnosticTest.java
index c7bcfdf7a47..fd0da83b9be 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnosticTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonExportMethodsInApiRegionDiagnosticTest.java
@@ -42,12 +42,13 @@ void test() {
     List<Diagnostic> diagnostics = getDiagnostics();
 
     // then
-    assertThat(diagnostics).hasSize(3);
+    assertThat(diagnostics).hasSize(4);
     assertThat(diagnostics, true)
       // на +
       .hasRange(8, 10, 8, 16)
       .hasRange(20, 10, 20, 13)
       .hasRange(25, 14, 25, 27)
+      .hasRange(64, 10, 64, 39)
     ;
   }
 }
diff --git a/src/test/resources/diagnostics/NonExportMethodsInApiRegionDiagnostic.bsl b/src/test/resources/diagnostics/NonExportMethodsInApiRegionDiagnostic.bsl
index 0041b1ecda6..aec2593f7c4 100644
--- a/src/test/resources/diagnostics/NonExportMethodsInApiRegionDiagnostic.bsl
+++ b/src/test/resources/diagnostics/NonExportMethodsInApiRegionDiagnostic.bsl
@@ -58,4 +58,11 @@
 
 // вне региона, не должно срабатывать
 Процедура ВнеОбластиНеЭкспортная()
-КонецПроцедуры
\ No newline at end of file
+КонецПроцедуры
+
+#Область СлужебныйПрограммныйИнтерфейс
+
+Процедура СлужебныйПрограммныйИнтерфейс() // сработает
+КонецПроцедуры
+
+#КонецОбласти

From 0dd546b92bd2e19820f124e9f5b02f41a65e7880 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 25 May 2020 10:25:35 +0300
Subject: [PATCH 420/444] =?UTF-8?q?#1212=20=D0=A2=D0=B5=D0=B3=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D1=8E=D1=82=20=D0=B2=20ignore=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/computer/DiagnosticIgnoranceComputer.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
index e04f9527a64..a91b77cdb8b 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java
@@ -23,6 +23,7 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.AllArgsConstructor;
 import org.antlr.v4.runtime.Token;
 import org.apache.commons.lang3.Range;
@@ -46,19 +47,19 @@ public class DiagnosticIgnoranceComputer implements Computer<DiagnosticIgnorance
 
   private static final DiagnosticCode ALL_DIAGNOSTICS_KEY = new DiagnosticCode("all");
 
-  private static final Pattern IGNORE_ALL_ON = Pattern.compile(
+  private static final Pattern IGNORE_ALL_ON = CaseInsensitivePattern.compile(
     "BSLLS-(?:вкл|on)"
   );
 
-  private static final Pattern IGNORE_ALL_OFF = Pattern.compile(
+  private static final Pattern IGNORE_ALL_OFF = CaseInsensitivePattern.compile(
     "BSLLS-(?:выкл|off)"
   );
 
-  private static final Pattern IGNORE_DIAGNOSTIC_ON = Pattern.compile(
+  private static final Pattern IGNORE_DIAGNOSTIC_ON = CaseInsensitivePattern.compile(
     "BSLLS:(\\w+)-(?:вкл|on)"
   );
 
-  private static final Pattern IGNORE_DIAGNOSTIC_OFF = Pattern.compile(
+  private static final Pattern IGNORE_DIAGNOSTIC_OFF = CaseInsensitivePattern.compile(
     "BSLLS:(\\w+)-(?:выкл|off)"
   );
 

From 5b770dce85d659e1860c978d37d072c7fd76a9a1 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 25 May 2020 10:25:59 +0300
Subject: [PATCH 421/444] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20case=20insensative?=
 =?UTF-8?q?=20pattern=20=D0=B8=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20visitSom?=
 =?UTF-8?q?ething?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...inTransactionBeforeTryCatchDiagnostic.java |  7 ++-
 ...tTransactionOutsideTryCatchDiagnostic.java |  7 ++-
 .../DataExchangeLoadingDiagnostic.java        | 13 +++--
 .../DeletingCollectionItemDiagnostic.java     |  6 +-
 .../DeprecatedAttributes8312Diagnostic.java   | 55 ++++++++++---------
 .../DeprecatedCurrentDateDiagnostic.java      |  6 +-
 .../diagnostics/DeprecatedFindDiagnostic.java |  6 +-
 .../DeprecatedMessageDiagnostic.java          |  6 +-
 .../DeprecatedMethods8310Diagnostic.java      |  4 +-
 .../DeprecatedMethods8317Diagnostic.java      |  6 +-
 .../DeprecatedTypeManagedFormDiagnostic.java  | 11 ++--
 .../ExcessiveAutoTestCheckDiagnostic.java     |  6 +-
 .../FormDataToValueDiagnostic.java            |  6 +-
 .../FunctionNameStartsWithGetDiagnostic.java  |  6 +-
 ...unctionReturnsSamePrimitiveDiagnostic.java |  6 +-
 .../diagnostics/GetFormMethodDiagnostic.java  |  6 +-
 .../IsInRoleMethodDiagnosticDiagnostic.java   | 11 ++--
 .../diagnostics/MissingSpaceDiagnostic.java   |  3 +-
 ...issingTemporaryFileDeletionDiagnostic.java | 19 ++++---
 .../NonStandardRegionDiagnostic.java          |  7 ++-
 .../diagnostics/OSUsersMethodDiagnostic.java  |  6 +-
 .../OneStatementPerLineDiagnostic.java        |  7 ++-
 .../PairingBrokenTransactionDiagnostic.java   | 18 +++---
 .../PublicMethodsDescriptionDiagnostic.java   |  6 +-
 .../diagnostics/SelfAssignDiagnostic.java     |  4 +-
 .../diagnostics/SelfInsertionDiagnostic.java  |  8 +--
 .../SeveralCompilerDirectivesDiagnostic.java  |  4 +-
 .../SpaceAtStartCommentDiagnostic.java        | 28 +++-------
 .../diagnostics/TempFilesDirDiagnostic.java   |  6 +-
 .../ThisObjectAssignDiagnostic.java           |  6 +-
 ...TimeoutsInExternalResourcesDiagnostic.java | 18 +++---
 .../diagnostics/TryNumberDiagnostic.java      |  6 +-
 .../UnknownPreprocessorSymbolDiagnostic.java  |  2 +-
 .../UnsafeSafeModeMethodCallDiagnostic.java   |  6 +-
 .../UnusedLocalMethodDiagnostic.java          | 11 ++--
 .../UnusedParametersDiagnostic.java           |  7 +--
 .../UsingCancelParameterDiagnostic.java       | 27 +++++----
 .../UsingExternalCodeToolsDiagnostic.java     | 13 +++--
 .../UsingFindElementByStringDiagnostic.java   |  7 ++-
 ...UsingHardcodeNetworkAddressDiagnostic.java | 16 ++----
 .../UsingHardcodePathDiagnostic.java          | 13 ++---
 ...ngHardcodeSecretInformationDiagnostic.java | 44 ++++++---------
 .../UsingModalWindowsDiagnostic.java          | 14 +++--
 ...UsingObjectNotAvailableUnixDiagnostic.java | 13 +++--
 .../UsingServiceTagDiagnostic.java            | 12 +---
 .../UsingSynchronousCallsDiagnostic.java      | 20 ++++---
 ...OfRollbackTransactionMethodDiagnostic.java |  7 ++-
 .../utils/MultilingualStringAnalyser.java     | 26 ++++-----
 48 files changed, 267 insertions(+), 285 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
index 5776dc85206..3d0ee2cea5a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BeginTransactionBeforeTryCatchDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Optional;
@@ -44,9 +45,9 @@
   }
 )
 public class BeginTransactionBeforeTryCatchDiagnostic extends AbstractVisitorDiagnostic {
-  private static final Pattern BEGIN_TRANSACTION_PATTERN = Pattern.compile(
-    "^НачатьТранзакцию$|^BeginTransaction$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern BEGIN_TRANSACTION_PATTERN = CaseInsensitivePattern.compile(
+    "^НачатьТранзакцию$|^BeginTransaction$"
+  );
 
   private BSLParserRuleContext nodeBeginTransaction;
   private BSLParser.StatementContext nodeEndFile;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommitTransactionOutsideTryCatchDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommitTransactionOutsideTryCatchDiagnostic.java
index 0b644595cc9..ad63b08db84 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommitTransactionOutsideTryCatchDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CommitTransactionOutsideTryCatchDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.regex.Pattern;
@@ -44,9 +45,9 @@
 )
 public class CommitTransactionOutsideTryCatchDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern END_TRANSACTION_PATTERN = Pattern.compile(
-    "ЗафиксироватьТранзакцию|CommitTransaction",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern END_TRANSACTION_PATTERN = CaseInsensitivePattern.compile(
+    "ЗафиксироватьТранзакцию|CommitTransaction"
+  );
 
   private BSLParserRuleContext nodeEndTransaction;
   private BSLParser.StatementContext nodeEndFile;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
index 0a79378fade..f8bce428602 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DataExchangeLoadingDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
@@ -57,12 +58,12 @@
 )
 public class DataExchangeLoadingDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern searchSubNames = Pattern.compile(
-    "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-  private static final Pattern searchCondition = Pattern.compile(
-    "ОбменДанными\\.Загрузка|DataExchange\\.Load",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern searchSubNames = CaseInsensitivePattern.compile(
+    "^(ПередЗаписью|ПриЗаписи|ПередУдалением|BeforeWrite|BeforeDelete|OnWrite)$"
+  );
+  private static final Pattern searchCondition = CaseInsensitivePattern.compile(
+    "ОбменДанными\\.Загрузка|DataExchange\\.Load"
+  );
 
   private static final boolean FIND_FIRST = false;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeletingCollectionItemDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeletingCollectionItemDiagnostic.java
index 87e340bec0b..28f0733917c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeletingCollectionItemDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeletingCollectionItemDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParser.CallStatementContext;
 import com.github._1c_syntax.bsl.parser.BSLParser.MethodCallContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Locale;
@@ -47,9 +48,8 @@
 )
 public class DeletingCollectionItemDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern DELETE_CALL_PATTERN = Pattern.compile(
-    "(удалить|delete)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern DELETE_CALL_PATTERN = CaseInsensitivePattern.compile(
+    "(удалить|delete)"
   );
   private static final Predicate<MethodCallContext> MATCH_METHOD_CALL_DELETE
     = e -> DELETE_CALL_PATTERN.matcher(e.methodName().getText()).matches();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
index c4447a11954..72f7671d8fa 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedAttributes8312Diagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
@@ -187,41 +188,41 @@ public class DeprecatedAttributes8312Diagnostic extends AbstractVisitorDiagnosti
       "ГоризонтальнаяВсегда");
   }
 
-  private static final Pattern CHART_PLOT_AREA_ATTRIBUTES_PATTERN = Pattern.compile(
-    getDeprecatedAttributesRegex(Metaobject.CHART_PLOT_AREA),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_PLOT_AREA_ATTRIBUTES_PATTERN = CaseInsensitivePattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.CHART_PLOT_AREA)
+  );
 
-  private static final Pattern CHART_ATTRIBUTES_PATTERN = Pattern.compile(
-    getDeprecatedAttributesRegex(Metaobject.CHART),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_ATTRIBUTES_PATTERN = CaseInsensitivePattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.CHART)
+  );
 
-  private static final Pattern CHART_METHODS_PATTERN = Pattern.compile(
-    getDeprecatedMethodsRegex(Metaobject.CHART),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_METHODS_PATTERN = CaseInsensitivePattern.compile(
+    getDeprecatedMethodsRegex(Metaobject.CHART)
+  );
 
-  private static final Pattern CHART_PLOT_AREA_NAME_PATTERN = Pattern.compile(
-    getMetaobjectNameRegex(Metaobject.CHART_PLOT_AREA),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_PLOT_AREA_NAME_PATTERN = CaseInsensitivePattern.compile(
+    getMetaobjectNameRegex(Metaobject.CHART_PLOT_AREA)
+  );
 
-  private static final Pattern CHART_NAME_PATTERN = Pattern.compile(
-    getMetaobjectNameRegex(Metaobject.CHART),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_NAME_PATTERN = CaseInsensitivePattern.compile(
+    getMetaobjectNameRegex(Metaobject.CHART)
+  );
 
-  private static final Pattern CHART_LABELS_ORIENTATION_PATTERN = Pattern.compile(
-    CHART_LABELS_ORIENTATION_RU,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHART_LABELS_ORIENTATION_PATTERN = CaseInsensitivePattern.compile(
+    CHART_LABELS_ORIENTATION_RU
+  );
 
-  private static final Pattern CHILD_FORM_ITEMS_GROUP_NAME_PATTERN = Pattern.compile(
-    getMetaobjectNameRegex(Metaobject.ENUM_ITEMS_GROUP),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHILD_FORM_ITEMS_GROUP_NAME_PATTERN = CaseInsensitivePattern.compile(
+    getMetaobjectNameRegex(Metaobject.ENUM_ITEMS_GROUP)
+  );
 
-  private static final Pattern CHILD_FORM_ITEMS_GROUP_ATTRIBUTE_PATTERN = Pattern.compile(
-    getDeprecatedAttributesRegex(Metaobject.ENUM_ITEMS_GROUP),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CHILD_FORM_ITEMS_GROUP_ATTRIBUTE_PATTERN = CaseInsensitivePattern.compile(
+    getDeprecatedAttributesRegex(Metaobject.ENUM_ITEMS_GROUP)
+  );
 
-  private static final Pattern CLEAR_EVENT_LOG_PATTERN = Pattern.compile(
-    CLEAR_EVENT_LOG_EN + "|" + CLEAR_EVENT_LOG_RU,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern CLEAR_EVENT_LOG_PATTERN = CaseInsensitivePattern.compile(
+    CLEAR_EVENT_LOG_EN + "|" + CLEAR_EVENT_LOG_RU
+  );
 
   public DeprecatedAttributes8312Diagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
index 35224ae62e1..f21ee742805 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedCurrentDateDiagnostic.java
@@ -28,6 +28,7 @@
 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 java.util.regex.Pattern;
 
@@ -44,9 +45,8 @@
 
 )
 public class DeprecatedCurrentDateDiagnostic extends AbstractFindMethodDiagnostic {
-  private static final Pattern currentDatePattern = Pattern.compile(
-    "(текущаядата|currentdate)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern currentDatePattern = CaseInsensitivePattern.compile(
+    "(текущаядата|currentdate)"
   );
 
   public DeprecatedCurrentDateDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedFindDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedFindDiagnostic.java
index 927bdbb5003..6884876cada 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedFindDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedFindDiagnostic.java
@@ -29,6 +29,7 @@
 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 java.util.regex.Pattern;
 
@@ -41,9 +42,8 @@
   tags = {DiagnosticTag.DEPRECATED}
 )
 public class DeprecatedFindDiagnostic extends AbstractFindMethodDiagnostic {
-  private static final Pattern messagePattern = Pattern.compile(
-    "(найти|find)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern messagePattern = CaseInsensitivePattern.compile(
+    "(найти|find)"
   );
 
   public DeprecatedFindDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMessageDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMessageDiagnostic.java
index 8c6a7c994b1..25e8ed41780 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMessageDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMessageDiagnostic.java
@@ -28,6 +28,7 @@
 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 java.util.regex.Pattern;
 
@@ -42,9 +43,8 @@
   }
 )
 public class DeprecatedMessageDiagnostic extends AbstractFindMethodDiagnostic {
-  private static final Pattern messagePattern = Pattern.compile(
-    "(сообщить|message)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern messagePattern = CaseInsensitivePattern.compile(
+    "(сообщить|message)"
   );
 
   public DeprecatedMessageDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
index 004d9b14d6e..5bbae3f859f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8310Diagnostic.java
@@ -29,6 +29,7 @@
 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.HashMap;
@@ -63,8 +64,7 @@ public class DeprecatedMethods8310Diagnostic extends AbstractVisitorDiagnostic {
   private static final String CLIENT_INTERFACE_VARIANT_RU = "ТекущийВариантИнтерфейсаКлиентскогоПриложения";
   private static final String CLIENT_INTERFACE_VARIANT_EN = "ClientApplicationInterfaceCurrentVariant";
 
-  private static final Pattern METHOD_PATTERN = Pattern.compile(getRegex(),
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern METHOD_PATTERN = CaseInsensitivePattern.compile(getRegex());
 
   private static final HashMap<String, String> newMethods = new HashMap<>();
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
index c4fe85f37e5..cd60f848853 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethods8317Diagnostic.java
@@ -29,6 +29,7 @@
 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 java.util.regex.Pattern;
 
@@ -45,11 +46,10 @@
 )
 public class DeprecatedMethods8317Diagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern DEPRECATED_METHODS_NAMES = Pattern.compile(
+  private static final Pattern DEPRECATED_METHODS_NAMES = CaseInsensitivePattern.compile(
     "(КраткоеПредставлениеОшибки|BriefErrorDescription|" +
       "ПодробноеПредставлениеОшибки|DetailErrorDescription|" +
-      "ПоказатьИнформациюОбОшибке|ShowErrorInfo)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+      "ПоказатьИнформациюОбОшибке|ShowErrorInfo)"
   );
 
   public DeprecatedMethods8317Diagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
index d02c3690f45..77b7277344c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedTypeManagedFormDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -55,14 +56,12 @@
 )
 public class DeprecatedTypeManagedFormDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
 
-  private static final Pattern paramPattern = Pattern.compile(
-    "\"(УправляемаяФорма|ManagedForm)\"",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern paramPattern = CaseInsensitivePattern.compile(
+    "\"(УправляемаяФорма|ManagedForm)\""
   );
 
-  private static final Pattern methodPattern = Pattern.compile(
-    "(Тип|Type)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern methodPattern = CaseInsensitivePattern.compile(
+    "(Тип|Type)"
   );
 
   public DeprecatedTypeManagedFormDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
index 51b1faa4a31..b494401c80e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ExcessiveAutoTestCheckDiagnostic.java
@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.List;
@@ -50,9 +51,8 @@
 )
 public class ExcessiveAutoTestCheckDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern ERROR_EXPRESSION = Pattern.compile(
-    "(\\.Свойство\\(\"АвтоТест\"\\)|=\"АвтоТест\"|\\.Property\\(\"AutoTest\"\\)|=\"AutoTest\")$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern ERROR_EXPRESSION = CaseInsensitivePattern.compile(
+    "(\\.Свойство\\(\"АвтоТест\"\\)|=\"АвтоТест\"|\\.Property\\(\"AutoTest\"\\)|=\"AutoTest\")$"
   );
 
   public ExcessiveAutoTestCheckDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FormDataToValueDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FormDataToValueDiagnostic.java
index d3eb673adfd..edef43448d8 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FormDataToValueDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FormDataToValueDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParser.GlobalMethodCallContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -47,9 +48,8 @@
 )
 public class FormDataToValueDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern MESSAGE_PATTERN = Pattern.compile(
-    "ДанныеФормыВЗначение|FormDataToValue",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern MESSAGE_PATTERN = CaseInsensitivePattern.compile(
+    "ДанныеФормыВЗначение|FormDataToValue"
   );
 
   public FormDataToValueDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionNameStartsWithGetDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionNameStartsWithGetDiagnostic.java
index cc299545886..acad1b0a16c 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionNameStartsWithGetDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionNameStartsWithGetDiagnostic.java
@@ -27,6 +27,7 @@
 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.regex.Pattern;
@@ -42,9 +43,8 @@
 
 )
 public class FunctionNameStartsWithGetDiagnostic extends AbstractVisitorDiagnostic {
-  private static final Pattern get = Pattern.compile(
-    "^Получить.*$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern get = CaseInsensitivePattern.compile(
+    "^Получить.*$"
   );
 
   public FunctionNameStartsWithGetDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
index 0f6f2e754ae..a9d6f19c7c6 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FunctionReturnsSamePrimitiveDiagnostic.java
@@ -32,6 +32,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.Range;
@@ -57,8 +58,9 @@
 public class FunctionReturnsSamePrimitiveDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final String KEY_MESSAGE = "diagnosticMessageReturnStatement";
-  private static final Pattern pattern = Pattern.compile(
-    "^(подключаемый|attachable)_", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern pattern = CaseInsensitivePattern.compile(
+    "^(подключаемый|attachable)_"
+  );
 
   private static final boolean SKIP_ATTACHABLE = true;
   private static final boolean CASE_SENSITIVE_FOR_STRING = false;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/GetFormMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/GetFormMethodDiagnostic.java
index fa821297360..170acabd526 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/GetFormMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/GetFormMethodDiagnostic.java
@@ -27,6 +27,7 @@
 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.utils.CaseInsensitivePattern;
 
 import java.util.regex.Pattern;
 
@@ -42,9 +43,8 @@
 )
 public class GetFormMethodDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern MESSAGE_PATTERN = Pattern.compile(
-    "ПолучитьФорму|GetForm",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern MESSAGE_PATTERN = CaseInsensitivePattern.compile(
+    "ПолучитьФорму|GetForm"
   );
 
   public GetFormMethodDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
index addd9295213..e2f27bbe188 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/IsInRoleMethodDiagnosticDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Collection;
@@ -51,14 +52,12 @@ public class IsInRoleMethodDiagnosticDiagnostic extends AbstractVisitorDiagnosti
   private static final HashSet<String> IS_IN_ROLE_VARS = new HashSet<>();
   private static final HashSet<String> PRIVILEGED_MODE_NAME_VARS = new HashSet<>();
 
-  private static final Pattern IS_IN_ROLE_NAME_PATTERN = Pattern.compile(
-    "(РольДоступна|IsInRole)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern IS_IN_ROLE_NAME_PATTERN = CaseInsensitivePattern.compile(
+    "(РольДоступна|IsInRole)"
   );
 
-  private static final Pattern PRIVILEGED_MODE_NAME_PATTERN = Pattern.compile(
-    "(PrivilegedMode|ПривилегированныйРежим)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern PRIVILEGED_MODE_NAME_PATTERN = CaseInsensitivePattern.compile(
+    "(PrivilegedMode|ПривилегированныйРежим)"
   );
 
   public IsInRoleMethodDiagnosticDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
index fcb374ebb51..f36183cd977 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingSpaceDiagnostic.java
@@ -32,6 +32,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.DiagnosticHelper;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.Token;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -148,7 +149,7 @@ private static Pattern compilePattern(String string) {
       return null;
     }
 
-    return Pattern.compile(string, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+    return CaseInsensitivePattern.compile(string);
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
index 28df878d75c..0e7b551b54e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissingTemporaryFileDeletionDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNodeImpl;
 
@@ -53,17 +54,17 @@ public class MissingTemporaryFileDeletionDiagnostic extends AbstractVisitorDiagn
 
   public static final String REGEX_DELETION_FILE = "УдалитьФайлы|DeleteFiles|ПереместитьФайл|MoveFile";
 
-  private static final Pattern searchGetTempFileName = Pattern.compile(
-    "^(ПолучитьИмяВременногоФайла|GetTempFileName)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern searchGetTempFileName = CaseInsensitivePattern.compile(
+    "^(ПолучитьИмяВременногоФайла|GetTempFileName)"
+  );
 
   @DiagnosticParameter(
     type = String.class,
     defaultValue = REGEX_DELETION_FILE
   )
-  private Pattern searchDeleteFileMethod = Pattern.compile(
-    "^(" + REGEX_DELETION_FILE + ")",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private Pattern searchDeleteFileMethod = CaseInsensitivePattern.compile(
+    "^(" + REGEX_DELETION_FILE + ")"
+  );
 
   public MissingTemporaryFileDeletionDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -76,9 +77,9 @@ public void configure(Map<String, Object> configuration) {
     }
     String searchDeleteFileMethodProperty =
       (String) configuration.getOrDefault("searchDeleteFileMethod", REGEX_DELETION_FILE);
-    searchDeleteFileMethod = Pattern.compile(
-      "^(" + searchDeleteFileMethodProperty + ")",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+    searchDeleteFileMethod = CaseInsensitivePattern.compile(
+      "^(" + searchDeleteFileMethodProperty + ")"
+    );
   }
 
   /**
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
index cdb159d46b2..7cac399a311 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/NonStandardRegionDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Keywords;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
 import java.util.Collections;
 import java.util.EnumMap;
@@ -171,9 +172,9 @@ private static Pattern createPattern(String keywordRu, String keywordEn) {
   }
 
   private static Pattern createPattern(String keywordRu, String keywordEn, String template) {
-    return Pattern.compile(
-      String.format(template, keywordRu, keywordEn),
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+    return CaseInsensitivePattern.compile(
+      String.format(template, keywordRu, keywordEn)
+    );
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OSUsersMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OSUsersMethodDiagnostic.java
index 242f7ea2794..3f77f91c2ac 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OSUsersMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OSUsersMethodDiagnostic.java
@@ -28,6 +28,7 @@
 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 java.util.regex.Pattern;
 
@@ -43,9 +44,8 @@
 )
 public class OSUsersMethodDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern messagePattern = Pattern.compile(
-    "ПользователиОС|OSUsers",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern messagePattern = CaseInsensitivePattern.compile(
+    "ПользователиОС|OSUsers"
   );
 
   public OSUsersMethodDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
index 9117679f4cc..e05b48fde2d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/OneStatementPerLineDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.languageserver.utils.RelatedInformation;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -55,9 +56,9 @@
   }
 )
 public class OneStatementPerLineDiagnostic extends AbstractVisitorDiagnostic implements QuickFixProvider {
-  private static final Pattern NEW_LINE_PATTERN = Pattern.compile(
-    "^(\\s+?)[^\\s]",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern NEW_LINE_PATTERN = CaseInsensitivePattern.compile(
+    "^(\\s+?)[^\\s]"
+  );
   private int previousLineNumber;
   private final List<BSLParser.StatementContext> statementsPerLine = new ArrayList<>();
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
index abff7294f17..b9bd44aa69e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PairingBrokenTransactionDiagnostic.java
@@ -28,6 +28,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 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.ArrayDeque;
@@ -47,16 +48,17 @@
 )
 public class PairingBrokenTransactionDiagnostic extends AbstractVisitorDiagnostic {
 
-  private final Pattern beginTransaction = Pattern.compile("НачатьТранзакцию|BeginTransaction",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private final Pattern beginTransaction = CaseInsensitivePattern.compile(
+    "НачатьТранзакцию|BeginTransaction"
+  );
 
-  private final Pattern beginEndTransaction = Pattern.compile(
-    "ЗафиксироватьТранзакцию|CommitTransaction|НачатьТранзакцию|BeginTransaction",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private final Pattern beginEndTransaction = CaseInsensitivePattern.compile(
+    "ЗафиксироватьТранзакцию|CommitTransaction|НачатьТранзакцию|BeginTransaction"
+  );
 
-  private final Pattern beginCancelTransaction = Pattern.compile(
-    "ОтменитьТранзакцию|RollbackTransaction|НачатьТранзакцию|BeginTransaction",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private final Pattern beginCancelTransaction = CaseInsensitivePattern.compile(
+    "ОтменитьТранзакцию|RollbackTransaction|НачатьТранзакцию|BeginTransaction"
+  );
 
   private final HashMap<String, String> pairMethodsBeginEnd = new HashMap<>();
   private final HashMap<String, String> pairMethodsBeginCancel = new HashMap<>();
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
index ebdaa24274e..5e15f91782f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/PublicMethodsDescriptionDiagnostic.java
@@ -31,6 +31,7 @@
 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.regex.Pattern;
@@ -47,9 +48,8 @@
 )
 public class PublicMethodsDescriptionDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern API_REGION_NAME = Pattern.compile(
-    "^(?:ПрограммныйИнтерфейс|Public)$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern API_REGION_NAME = CaseInsensitivePattern.compile(
+    "^(?:ПрограммныйИнтерфейс|Public)$"
   );
 
   private static final boolean DEFAULT_CHECK_ALL_REGION = false;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfAssignDiagnostic.java
index 63d68e19b03..792940f3d01 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfAssignDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfAssignDiagnostic.java
@@ -52,7 +52,7 @@ public ParseTree visitAssignment(BSLParser.AssignmentContext ctx) {
     BSLParser.ExpressionContext expression = ctx.expression();
 
     if (expression == null) {
-      return super.visitAssignment(ctx);
+      return ctx;
     }
 
     if (ctx.lValue().getText().equalsIgnoreCase(expression.getText())
@@ -60,7 +60,7 @@ && getDescendantsCount(ctx.lValue()) == getDescendantsCount(expression)) {
       diagnosticStorage.addDiagnostic(ctx);
     }
 
-    return super.visitAssignment(ctx);
+    return ctx;
   }
 
   private static int getDescendantsCount(ParserRuleContext tree) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfInsertionDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfInsertionDiagnostic.java
index 9ed0a6f0d14..ee3812bf755 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfInsertionDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SelfInsertionDiagnostic.java
@@ -27,6 +27,7 @@
 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.List;
@@ -44,9 +45,8 @@
 )
 public class SelfInsertionDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern deletePattern = Pattern.compile(
-    "(вставить|добавить|insert|add)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern deletePattern = CaseInsensitivePattern.compile(
+    "(вставить|добавить|insert|add)"
   );
 
   public SelfInsertionDiagnostic(DiagnosticInfo info) {
@@ -76,7 +76,7 @@ public ParseTree visitCallStatement(BSLParser.CallStatementContext ctx) {
       }
     }
 
-    return super.visitCallStatement(ctx);
+    return ctx;
   }
 
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SeveralCompilerDirectivesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SeveralCompilerDirectivesDiagnostic.java
index 7335b912073..c2aeccb9a17 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SeveralCompilerDirectivesDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SeveralCompilerDirectivesDiagnostic.java
@@ -53,7 +53,7 @@ public ParseTree visitModuleVar(BSLParser.ModuleVarContext ctx) {
     if (Trees.findAllRuleNodes(ctx, BSLParser.RULE_compilerDirective).size() > 1) {
       diagnosticStorage.addDiagnostic(ctx.moduleVarsList());
     }
-    return super.visitModuleVar(ctx);
+    return ctx;
   }
 
   @Override
@@ -64,6 +64,6 @@ public ParseTree visitSub(BSLParser.SubContext ctx) {
       diagnosticStorage.addDiagnostic(methodSymbol.get().getSubNameRange());
     }
 
-    return super.visitSub(ctx);
+    return ctx;
   }
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
index 4151a662d2b..1bcfe983e7a 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/SpaceAtStartCommentDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.providers.CodeActionProvider;
 import com.github._1c_syntax.bsl.languageserver.recognizer.BSLFootprint;
 import com.github._1c_syntax.bsl.languageserver.recognizer.CodeRecognizer;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.Token;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -53,19 +54,16 @@
   }
 )
 
-public class SpaceAtStartCommentDiagnostic implements QuickFixProvider, BSLDiagnostic {
+public class SpaceAtStartCommentDiagnostic extends AbstractDiagnostic implements QuickFixProvider {
 
   private static final String DEFAULT_COMMENTS_ANNOTATION = "//@,//(c),//©";
-  private static final Pattern goodCommentPattern = Pattern.compile(
-    "(?://\\s.*)|(?://[/]*\\s*)$",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern goodCommentPattern = CaseInsensitivePattern.compile(
+    "(?://\\s.*)|(?://[/]*\\s*)$"
   );
   private static final int COMMENT_LENGTH = 2;
 
   private static final float COMMENTED_CODE_THRESHOLD = 0.9F;
-  protected final DiagnosticStorage diagnosticStorage = new DiagnosticStorage(this);
   private final CodeRecognizer codeRecognizer;
-  private final DiagnosticInfo info;
 
   @DiagnosticParameter(
     type = String.class,
@@ -74,7 +72,7 @@ public class SpaceAtStartCommentDiagnostic implements QuickFixProvider, BSLDiagn
   private Pattern commentsAnnotation = createCommentsAnnotationPattern(DEFAULT_COMMENTS_ANNOTATION.split(","));
 
   public SpaceAtStartCommentDiagnostic(DiagnosticInfo info) {
-    this.info = info;
+    super(info);
     this.codeRecognizer = new CodeRecognizer(COMMENTED_CODE_THRESHOLD, new BSLFootprint());
   }
 
@@ -85,10 +83,7 @@ private static Pattern createCommentsAnnotationPattern(String[] patternParts) {
       stringJoiner.add(commentsAnnotationPatternString);
     }
 
-    return Pattern.compile(
-      stringJoiner.toString(),
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
-    );
+    return CaseInsensitivePattern.compile(stringJoiner.toString());
   }
 
   @Override
@@ -103,9 +98,7 @@ public void configure(Map<String, Object> configuration) {
   }
 
   @Override
-  public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
-    diagnosticStorage.clearDiagnostics();
-
+  public void check() {
     documentContext.getComments()
       .parallelStream()
       .filter((Token t) ->
@@ -114,13 +107,6 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
           && !codeRecognizer.meetsCondition(t.getText()))
       .sequential()
       .forEach(diagnosticStorage::addDiagnostic);
-
-    return diagnosticStorage.getDiagnostics();
-  }
-
-  @Override
-  public DiagnosticInfo getInfo() {
-    return info;
   }
 
   @Override
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TempFilesDirDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TempFilesDirDiagnostic.java
index 3896d3b2188..0abf733b59d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TempFilesDirDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TempFilesDirDiagnostic.java
@@ -28,6 +28,7 @@
 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 java.util.regex.Pattern;
 
@@ -44,9 +45,8 @@
 )
 public class TempFilesDirDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern MESSAGE_PATTERN = Pattern.compile(
-    "КаталогВременныхФайлов|TempFilesDir",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern MESSAGE_PATTERN = CaseInsensitivePattern.compile(
+    "КаталогВременныхФайлов|TempFilesDir"
   );
 
   public TempFilesDirDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
index 83c03974bdd..184b8c19e02 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
@@ -52,9 +53,8 @@
 )
 public class ThisObjectAssignDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern thisObjectPattern = Pattern.compile(
-    "(этотобъект|thisobject)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern thisObjectPattern = CaseInsensitivePattern.compile(
+    "(этотобъект|thisobject)"
   );
 
   public ThisObjectAssignDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
index 6a4bfc16cbe..36aa1cebd41 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TimeoutsInExternalResourcesDiagnostic.java
@@ -32,6 +32,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.CompatibilityMode;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
@@ -53,15 +54,16 @@
 )
 public class TimeoutsInExternalResourcesDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern PATTERN_TIMEOUT = Pattern.compile("^\\.(Таймаут|Timeout)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-  private static final Pattern PATTERN_NEW_EXPRESSION = Pattern.compile(
-    "^(FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection|WSОпределения|WSDefinitions|WSПрокси|WSProxy)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-  private static final Pattern PATTERN_NEW_EXPRESSION_WITH_MAIL = Pattern.compile(
+  private static final Pattern PATTERN_TIMEOUT = CaseInsensitivePattern.compile(
+    "^\\.(Таймаут|Timeout)"
+  );
+  private static final Pattern PATTERN_NEW_EXPRESSION = CaseInsensitivePattern.compile(
+    "^(FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection|WSОпределения|WSDefinitions|WSПрокси|WSProxy)"
+  );
+  private static final Pattern PATTERN_NEW_EXPRESSION_WITH_MAIL = CaseInsensitivePattern.compile(
     "^(FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection|WSОпределения|WSDefinitions|WSПрокси|WSProxy" +
-      "|ИнтернетПочтовыйПрофиль|InternetMailProfile)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+      "|ИнтернетПочтовыйПрофиль|InternetMailProfile)"
+  );
 
   private static final boolean ANALYZING_MAIL = true;
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TryNumberDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TryNumberDiagnostic.java
index ab0309f07d4..e6ee3f45781 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TryNumberDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/TryNumberDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParser.GlobalMethodCallContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.function.Predicate;
@@ -44,8 +45,9 @@
 )
 public class TryNumberDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern NUMBER_PATTERN = Pattern.compile("число|number",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern NUMBER_PATTERN = CaseInsensitivePattern.compile(
+    "число|number"
+  );
   private static final Predicate<GlobalMethodCallContext> MATCH_METHOD_CALL_CAST_TO_NUMBER
     = e -> NUMBER_PATTERN.matcher(e.methodName().getText()).matches();
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnknownPreprocessorSymbolDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnknownPreprocessorSymbolDiagnostic.java
index 43bee4eaf00..1b2c065366e 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnknownPreprocessorSymbolDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnknownPreprocessorSymbolDiagnostic.java
@@ -47,7 +47,7 @@ public UnknownPreprocessorSymbolDiagnostic(DiagnosticInfo info) {
   @Override
   public ParseTree visitPreproc_unknownSymbol(BSLParser.Preproc_unknownSymbolContext ctx) {
     diagnosticStorage.addDiagnostic(ctx, info.getMessage(ctx.getText()));
-    return super.visitPreproc_unknownSymbol(ctx);
+    return ctx;
   }
 
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
index 2921673ad5e..4b4ba50cd59 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeSafeModeMethodCallDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -49,9 +50,8 @@
 )
 public class UnsafeSafeModeMethodCallDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern SAFE_MODE_METHOD_NAME = Pattern.compile(
-    "(БезопасныйРежим|SafeMode)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern SAFE_MODE_METHOD_NAME = CaseInsensitivePattern.compile(
+    "(БезопасныйРежим|SafeMode)"
   );
   private static final Set<Integer> ROOT_LIST = Set.of(
     BSLParser.RULE_ifBranch, BSLParser.RULE_elsifBranch, BSLParser.RULE_expression,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedLocalMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedLocalMethodDiagnostic.java
index 9692ba6c54e..c8db9ff66e0 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedLocalMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedLocalMethodDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.ModuleType;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.Trees;
 
@@ -53,14 +54,12 @@
 )
 public class UnusedLocalMethodDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern ATTACHABLE_PATTERN = Pattern.compile(
-    "(подключаемый_.*|attachable_.*)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern ATTACHABLE_PATTERN = CaseInsensitivePattern.compile(
+    "(подключаемый_.*|attachable_.*)"
   );
 
-  private static final Pattern HANDLER_PATTERN = Pattern.compile(
-    "(ПриСозданииОбъекта|OnObjectCreate)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern HANDLER_PATTERN = CaseInsensitivePattern.compile(
+    "(ПриСозданииОбъекта|OnObjectCreate)"
   );
 
   public UnusedLocalMethodDiagnostic(DiagnosticInfo info) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedParametersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedParametersDiagnostic.java
index ffdb7419e15..338c7534985 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedParametersDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedParametersDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 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.List;
@@ -48,16 +49,14 @@
 
 public class UnusedParametersDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern HANDLER_PATTERN = Pattern.compile(
-    "(ПриСозданииОбъекта|OnObjectCreate)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern HANDLER_PATTERN = CaseInsensitivePattern.compile(
+    "(ПриСозданииОбъекта|OnObjectCreate)"
   );
 
   public UnusedParametersDiagnostic(DiagnosticInfo info) {
     super(info);
   }
 
-
   @Override
   public ParseTree visitSubCodeBlock(BSLParser.SubCodeBlockContext ctx) {
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
index ade4ce0c550..432bfd453bc 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Collection;
@@ -49,9 +50,8 @@
 )
 public class UsingCancelParameterDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern cancelPattern = Pattern.compile(
-    "отказ|cancel",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern cancelPattern = CaseInsensitivePattern.compile(
+    "отказ|cancel"
   );
 
   public UsingCancelParameterDiagnostic(DiagnosticInfo info) {
@@ -73,23 +73,22 @@ public ParseTree visitSub(BSLParser.SubContext ctx) {
       return ctx;
     }
 
-    int skip = 0;
     Collection<ParseTree> assigns = Trees.findAllRuleNodes(ctx, BSLParser.RULE_assignment);
 
-    List<ParseTree> tree = assigns.stream()
+    List<BSLParserRuleContext> tree = assigns.stream()
       .filter(
         node -> cancelPattern.matcher(((BSLParser.AssignmentContext) node).lValue()
           .getText())
           .matches()
-      ).collect(Collectors.toList());
-
-    tree.stream().skip(skip).forEach(
-      (ParseTree ident) -> {
-        if (!rightPartIsValid((BSLParser.AssignmentContext) ident)) {
-          diagnosticStorage.addDiagnostic((BSLParserRuleContext) ident.getParent());
-        }
-      }
-    );
+      )
+      .map(BSLParserRuleContext.class::cast)
+      .collect(Collectors.toList());
+
+    tree.stream()
+      .filter(ident -> !rightPartIsValid((BSLParser.AssignmentContext) ident))
+      .map(ParseTree::getParent)
+      .map(BSLParserRuleContext.class::cast)
+      .forEach(diagnosticStorage::addDiagnostic);
 
     return ctx;
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingExternalCodeToolsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingExternalCodeToolsDiagnostic.java
index 5843b245b91..5e635de1ecf 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingExternalCodeToolsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingExternalCodeToolsDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
@@ -45,14 +46,14 @@
 )
 public class UsingExternalCodeToolsDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern externalCodeToolsName = Pattern.compile(
+  private static final Pattern externalCodeToolsName = CaseInsensitivePattern.compile(
     "^(ВнешниеОбработки|ExternalDataProcessors|ВнешниеОтчеты|ExternalReports|" +
-      "РасширенияКонфигурации|ConfigurationExtensions)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+      "РасширенияКонфигурации|ConfigurationExtensions)"
+  );
 
-  private static final Pattern externalCodeToolsMethodsName = Pattern.compile(
-    "^(Создать|Create|Подключить|Connect)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern externalCodeToolsMethodsName = CaseInsensitivePattern.compile(
+    "^(Создать|Create|Подключить|Connect)"
+  );
 
   public UsingExternalCodeToolsDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
index 7dc290b06ad..0896f64fc84 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingFindElementByStringDiagnostic.java
@@ -28,6 +28,7 @@
 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.regex.Matcher;
@@ -47,9 +48,9 @@
 
 public class UsingFindElementByStringDiagnostic extends AbstractVisitorDiagnostic {
 
-  private final Pattern pattern = Pattern.compile(
-    "(НайтиПоНаименованию|FindByDescription|НайтиПоКоду|FindByCode)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private final Pattern pattern = CaseInsensitivePattern.compile(
+    "(НайтиПоНаименованию|FindByDescription|НайтиПоКоду|FindByCode)"
+  );
 
   public UsingFindElementByStringDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeNetworkAddressDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeNetworkAddressDiagnostic.java
index 5dad933c7c9..e32fbf18738 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeNetworkAddressDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeNetworkAddressDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
@@ -44,7 +45,6 @@
     DiagnosticTag.STANDARD
   }
 )
-
 public class UsingHardcodeNetworkAddressDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final String REGEX_NETWORK_ADDRESS =
@@ -67,15 +67,15 @@ public class UsingHardcodeNetworkAddressDiagnostic extends AbstractVisitorDiagno
 
   private static final String REGEX_ALPHABET = "[A-zА-я]";
 
-  private static final Pattern patternNetworkAddress = getLocalPattern(REGEX_NETWORK_ADDRESS);
-  private static final Pattern patternURL = getLocalPattern(REGEX_URL);
-  private static final Pattern patternAlphabet = getLocalPattern(REGEX_ALPHABET);
+  private static final Pattern patternNetworkAddress = CaseInsensitivePattern.compile(REGEX_NETWORK_ADDRESS);
+  private static final Pattern patternURL = CaseInsensitivePattern.compile(REGEX_URL);
+  private static final Pattern patternAlphabet = CaseInsensitivePattern.compile(REGEX_ALPHABET);
 
   @DiagnosticParameter(
     type = String.class,
     defaultValue = REGEX_EXCLUSION
   )
-  private Pattern searchWordsExclusion = getLocalPattern(REGEX_EXCLUSION);
+  private Pattern searchWordsExclusion = CaseInsensitivePattern.compile(REGEX_EXCLUSION);
 
   public UsingHardcodeNetworkAddressDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -91,7 +91,7 @@ public void configure(Map<String, Object> configuration) {
     // Слова исключения, при поиске IP адресов
     String searchWordsExclusionProperty =
       (String) configuration.getOrDefault("searchWordsExclusion", REGEX_EXCLUSION);
-    searchWordsExclusion = getLocalPattern(searchWordsExclusionProperty);
+    searchWordsExclusion = CaseInsensitivePattern.compile(searchWordsExclusionProperty);
 
   }
 
@@ -156,8 +156,4 @@ private boolean skipStatement(ParserRuleContext ctx, int ruleStatement) {
     return false;
   }
 
-  private static Pattern getLocalPattern(String content) {
-    return Pattern.compile(content, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-  }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodePathDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodePathDiagnostic.java
index 7c54553e063..11a1636647d 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodePathDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodePathDiagnostic.java
@@ -29,6 +29,7 @@
 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.Map;
@@ -58,14 +59,14 @@ public class UsingHardcodePathDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final String REGEX_URL = "^(ftp|http|https):\\/\\/[^ \"].*";
 
-  private static final Pattern patternPath = getLocalPattern(REGEX_PATH);
-  private static final Pattern patternURL = getLocalPattern(REGEX_URL);
+  private static final Pattern patternPath = CaseInsensitivePattern.compile(REGEX_PATH);
+  private static final Pattern patternURL = CaseInsensitivePattern.compile(REGEX_URL);
 
   @DiagnosticParameter(
     type = String.class,
     defaultValue = REGEX_STD_PATHS_UNIX
   )
-  private Pattern searchWordsStdPathsUnix = getLocalPattern("^\\/(" + REGEX_STD_PATHS_UNIX + ")");
+  private Pattern searchWordsStdPathsUnix = CaseInsensitivePattern.compile("^\\/(" + REGEX_STD_PATHS_UNIX + ")");
 
   public UsingHardcodePathDiagnostic(DiagnosticInfo info) {
     super(info);
@@ -80,7 +81,7 @@ public void configure(Map<String, Object> configuration) {
     // Слова поиска стандартных корневых каталогов Unix
     String searchWordsStdPathsUnixProperty =
       (String) configuration.getOrDefault("searchWordsStdPathsUnix", REGEX_STD_PATHS_UNIX);
-    searchWordsStdPathsUnix = getLocalPattern("^\\/(" + searchWordsStdPathsUnixProperty + ")");
+    searchWordsStdPathsUnix = CaseInsensitivePattern.compile("^\\/(" + searchWordsStdPathsUnixProperty + ")");
 
   }
 
@@ -115,8 +116,4 @@ private void processVisitString(BSLParser.StringContext ctx, String content) {
     diagnosticStorage.addDiagnostic(ctx);
   }
 
-  private static Pattern getLocalPattern(String content) {
-    return Pattern.compile(content, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-  }
-
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeSecretInformationDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeSecretInformationDiagnostic.java
index cf4bdb80cf6..a5444852122 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeSecretInformationDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingHardcodeSecretInformationDiagnostic.java
@@ -28,13 +28,14 @@
 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.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 
-import javax.annotation.CheckForNull;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -53,17 +54,17 @@ public class UsingHardcodeSecretInformationDiagnostic extends AbstractVisitorDia
 
   private static final String FIND_WORD_DEFAULT = "Пароль|Password";
 
-  private static final Pattern PATTERN_NEW_EXPRESSION = Pattern.compile(
-    "Структура|Structure|Соответствие|Map|FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern PATTERN_NEW_EXPRESSION = CaseInsensitivePattern.compile(
+    "Структура|Structure|Соответствие|Map|FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection"
+  );
 
-  private static final Pattern PATTERN_NEW_EXPRESSION_CONNECTION = Pattern.compile(
-    "FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern PATTERN_NEW_EXPRESSION_CONNECTION = CaseInsensitivePattern.compile(
+    "FTPСоединение|FTPConnection|HTTPСоединение|HTTPConnection"
+  );
 
-  private static final Pattern PATTERN_METHOD_INSERT = Pattern.compile(
-    "Вставить|Insert",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern PATTERN_METHOD_INSERT = CaseInsensitivePattern.compile(
+    "Вставить|Insert"
+  );
 
   private static final Pattern PATTERN_CHECK_PASSWORD = Pattern.compile("^[\\*]+$", Pattern.UNICODE_CASE);
 
@@ -87,9 +88,9 @@ public void configure(Map<String, Object> configuration) {
   }
 
   private static Pattern getPatternSearch(String value) {
-    return Pattern.compile(
-      "^(" + value + ")$",
-      Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+    return CaseInsensitivePattern.compile(
+      "^(" + value + ")$"
+    );
   }
 
   /**
@@ -205,7 +206,7 @@ private void processCheckNewExpression(BSLParser.NewExpressionContext ctx,
   private void processCheckAssignmentKey(BSLParserRuleContext ctx, String accessText) {
     Matcher matcher = searchWords.matcher(getClearString(accessText));
     if (matcher.find()) {
-      ParserRuleContext assignment = getAncestorByRuleIndex(
+      ParserRuleContext assignment = Trees.getAncestorByRuleIndex(
         (ParserRuleContext) ctx.getRuleContext(),
         BSLParser.RULE_assignment
       );
@@ -232,7 +233,7 @@ private void processParameterList(
   }
 
   private void addDiagnosticByAssignment(BSLParserRuleContext ctx, int type) {
-    ParserRuleContext assignment = getAncestorByRuleIndex((ParserRuleContext) ctx.getRuleContext(), type);
+    ParserRuleContext assignment = Trees.getAncestorByRuleIndex((ParserRuleContext) ctx.getRuleContext(), type);
     if (assignment != null) {
       diagnosticStorage.addDiagnostic((BSLParserRuleContext) assignment, info.getMessage());
     }
@@ -253,19 +254,6 @@ private static String getClearString(String inputString) {
     return inputString.replace("\"", "").replace(" ", "");
   }
 
-  // TODO: перенести в bsl parser
-  @CheckForNull
-  private static ParserRuleContext getAncestorByRuleIndex(ParserRuleContext element, int type) {
-    ParserRuleContext parent = element.getParent();
-    if (parent == null) {
-      return null;
-    }
-    if (parent.getRuleIndex() == type) {
-      return parent;
-    }
-    return getAncestorByRuleIndex(parent, type);
-  }
-
   private static boolean parentIsModifierContext(ParserRuleContext ctx) {
     return ctx.getParent() instanceof BSLParser.ModifierContext;
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
index ace9daa0e4e..1cf5236dab3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingModalWindowsDiagnostic.java
@@ -30,6 +30,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
@@ -48,13 +49,13 @@
 )
 public class UsingModalWindowsDiagnostic extends AbstractVisitorDiagnostic {
 
-  private final Pattern modalityMethods = Pattern.compile(
+  private final Pattern modalityMethods = CaseInsensitivePattern.compile(
     "(ВОПРОС|DOQUERYBOX|ОТКРЫТЬФОРМУМОДАЛЬНО|OPENFORMMODAL|ОТКРЫТЬЗНАЧЕНИЕ|OPENVALUE|" +
       "ПРЕДУПРЕЖДЕНИЕ|DOMESSAGEBOX|ВВЕСТИДАТУ|INPUTDATE|ВВЕСТИЗНАЧЕНИЕ|INPUTVALUE|" +
       "ВВЕСТИСТРОКУ|INPUTSTRING|ВВЕСТИЧИСЛО|INPUTNUMBER|УСТАНОВИТЬВНЕШНЮЮКОМПОНЕНТУ|INSTALLADDIN|" +
       "УСТАНОВИТЬРАСШИРЕНИЕРАБОТЫСФАЙЛАМИ|INSTALLFILESYSTEMEXTENSION|" +
-      "УСТАНОВИТЬРАСШИРЕНИЕРАБОТЫСКРИПТОГРАФИЕЙ|INSTALLCRYPTOEXTENSION|ПОМЕСТИТЬФАЙЛ|PUTFILE)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+      "УСТАНОВИТЬРАСШИРЕНИЕРАБОТЫСКРИПТОГРАФИЕЙ|INSTALLCRYPTOEXTENSION|ПОМЕСТИТЬФАЙЛ|PUTFILE)"
+  );
 
   private final HashMap<String, String> pairMethods = new HashMap<>();
 
@@ -87,7 +88,7 @@ public UsingModalWindowsDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+  public ParseTree visitFile(BSLParser.FileContext ctx) {
     var configuration = documentContext.getServerContext().getConfiguration();
     // если использование модальных окон разрешено (без предупреждение), то
     // ничего не диагностируется
@@ -95,6 +96,11 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       return ctx;
     }
 
+    return super.visitFile(ctx);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     String methodName = ctx.methodName().getText();
     if (modalityMethods.matcher(methodName).matches()) {
       diagnosticStorage.addDiagnostic(ctx,
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingObjectNotAvailableUnixDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingObjectNotAvailableUnixDiagnostic.java
index 94c37809edc..28e030f9e05 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingObjectNotAvailableUnixDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingObjectNotAvailableUnixDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 
@@ -47,13 +48,13 @@
 )
 public class UsingObjectNotAvailableUnixDiagnostic extends AbstractVisitorDiagnostic {
 
-  private static final Pattern patternNewExpression = Pattern.compile(
-    "^(COMОбъект|COMObject|Почта|Mail)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern patternNewExpression = CaseInsensitivePattern.compile(
+    "^(COMОбъект|COMObject|Почта|Mail)"
+  );
 
-  private static final Pattern patternTypePlatform = Pattern.compile(
-    "Linux_x86|Windows|MacOS",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern patternTypePlatform = CaseInsensitivePattern.compile(
+    "Linux_x86|Windows|MacOS"
+  );
 
   public UsingObjectNotAvailableUnixDiagnostic(DiagnosticInfo info) {
     super(info);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
index ce939ebe99e..934a9dff8b7 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingServiceTagDiagnostic.java
@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 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.DiagnosticParameter;
@@ -29,9 +28,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import org.antlr.v4.runtime.Token;
-import org.eclipse.lsp4j.Diagnostic;
 
-import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -43,7 +40,7 @@
     DiagnosticTag.BADPRACTICE
   }
 )
-public class UsingServiceTagDiagnostic extends AbstractVisitorDiagnostic {
+public class UsingServiceTagDiagnostic extends AbstractDiagnostic {
 
   private static final String SERVICE_TAGS_DEFAULT = "todo|fixme|!!|mrg|@|отладка|debug|для\\s*отладки"
     + "|(\\{\\{|\\}\\})КОНСТРУКТОР_|(\\{\\{|\\}\\})MRG"
@@ -78,10 +75,7 @@ public Pattern getPatternSearch(String value) {
   }
 
   @Override
-  public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
-
-    diagnosticStorage.clearDiagnostics();
-
+  public void check() {
     documentContext.getComments()
       .parallelStream()
       .forEach((Token token) -> {
@@ -94,8 +88,6 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
           info.getMessage(matcher.group(0))
         );
       });
-
-    return diagnosticStorage.getDiagnostics();
   }
 
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
index e7645bc2f4e..ce540d65d40 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingSynchronousCallsDiagnostic.java
@@ -31,6 +31,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.mdclasses.metadata.additional.UseMode;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.HashMap;
@@ -48,7 +49,7 @@
   compatibilityMode = DiagnosticCompatibilityMode.COMPATIBILITY_MODE_8_3_3
 )
 public class UsingSynchronousCallsDiagnostic extends AbstractVisitorDiagnostic {
-  private static final Pattern MODALITY_METHODS = Pattern.compile(
+  private static final Pattern MODALITY_METHODS = CaseInsensitivePattern.compile(
     "(ВОПРОС|DOQUERYBOX|ОТКРЫТЬФОРМУМОДАЛЬНО|OPENFORMMODAL|ОТКРЫТЬЗНАЧЕНИЕ|OPENVALUE|" +
       "ПРЕДУПРЕЖДЕНИЕ|DOMESSAGEBOX|ВВЕСТИДАТУ|INPUTDATE|ВВЕСТИЗНАЧЕНИЕ|INPUTVALUE|" +
       "ВВЕСТИСТРОКУ|INPUTSTRING|ВВЕСТИЧИСЛО|INPUTNUMBER|УСТАНОВИТЬВНЕШНЮЮКОМПОНЕНТУ|INSTALLADDIN|" +
@@ -59,12 +60,12 @@ public class UsingSynchronousCallsDiagnostic extends AbstractVisitorDiagnostic {
       "КОПИРОВАТЬФАЙЛ|FILECOPY|ПЕРЕМЕСТИТЬФАЙЛ|MOVEFILE|НАЙТИФАЙЛЫ|FINDFILES|УДАЛИТЬФАЙЛЫ|DELETEFILES|" +
       "СОЗДАТЬКАТАЛОГ|CREATEDIRECTORY|КАТАЛОГВРЕМЕННЫХФАЙЛОВ|TEMPFILESDIR|КАТАЛОГДОКУМЕНТОВ|DOCUMENTSDIR|" +
       "РАБОЧИЙКАТАЛОГДАННЫХПОЛЬЗОВАТЕЛЯ|USERDATAWORKDIR|ПОЛУЧИТЬФАЙЛЫ|GETFILES|ПОМЕСТИТЬФАЙЛЫ|PUTFILES|" +
-      "ЗАПРОСИТЬРАЗРЕШЕНИЕПОЛЬЗОВАТЕЛЯ|REQUESTUSERPERMISSION|ЗАПУСТИТЬПРИЛОЖЕНИЕ|RUNAPP)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+      "ЗАПРОСИТЬРАЗРЕШЕНИЕПОЛЬЗОВАТЕЛЯ|REQUESTUSERPERMISSION|ЗАПУСТИТЬПРИЛОЖЕНИЕ|RUNAPP)"
+  );
 
-  private static final Pattern SERVER_COMPILER_PATTERN = Pattern.compile(
-    "(НаСервере|НаСервереБезКонтекста|AtServer|AtServerNoContext)",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern SERVER_COMPILER_PATTERN = CaseInsensitivePattern.compile(
+    "(НаСервере|НаСервереБезКонтекста|AtServer|AtServerNoContext)"
+  );
 
   private final HashMap<String, String> pairMethods = new HashMap<>();
 
@@ -125,7 +126,7 @@ public UsingSynchronousCallsDiagnostic(DiagnosticInfo info) {
   }
 
   @Override
-  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
+  public ParseTree visitFile(BSLParser.FileContext ctx) {
     var configuration = documentContext.getServerContext().getConfiguration();
     // если использование синхронных вызовов разрешено (без предупреждение), то
     // ничего не диагностируется
@@ -133,6 +134,11 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
       return ctx;
     }
 
+    return super.visitFile(ctx);
+  }
+
+  @Override
+  public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
     String methodName = ctx.methodName().getText();
     if (MODALITY_METHODS.matcher(methodName).matches()) {
       BSLParser.SubContext rootParent = (BSLParser.SubContext) Trees.getRootParent(ctx, BSLParser.RULE_sub);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongUseOfRollbackTransactionMethodDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongUseOfRollbackTransactionMethodDiagnostic.java
index e452bcb10ef..0e227ca33eb 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongUseOfRollbackTransactionMethodDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongUseOfRollbackTransactionMethodDiagnostic.java
@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -45,9 +46,9 @@
 )
 public class WrongUseOfRollbackTransactionMethodDiagnostic extends AbstractFindMethodDiagnostic {
 
-  private static final Pattern MESSAGE_PATTERN = Pattern.compile(
-    "ОтменитьТранзакцию|RollbackTransaction",
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+  private static final Pattern MESSAGE_PATTERN = CaseInsensitivePattern.compile(
+    "ОтменитьТранзакцию|RollbackTransaction"
+  );
 
   public WrongUseOfRollbackTransactionMethodDiagnostic(DiagnosticInfo info) {
     super(info, MESSAGE_PATTERN);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
index a4c34ad530d..b82329e2bf5 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MultilingualStringAnalyser.java
@@ -22,6 +22,7 @@
 package com.github._1c_syntax.bsl.languageserver.utils;
 
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.ParserRuleContext;
 
 import java.util.ArrayList;
@@ -39,25 +40,20 @@ public final class MultilingualStringAnalyser {
   private static final String NSTR_LANG_REGEX = "\\w+\\s*=\\s*['|\"{2}]";
   private static final String NSTR_LANG_CUT_REGEX = "\\s*=\\s*['|\"{2}]";
   private static final String WHITE_SPACE_REGEX = "\\s";
-  private static final Pattern NSTR_METHOD_NAME_PATTERN = Pattern.compile(
-    NSTR_METHOD_NAME,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern NSTR_METHOD_NAME_PATTERN = CaseInsensitivePattern.compile(
+    NSTR_METHOD_NAME
   );
-  private static final Pattern TEMPLATE_METHOD_NAME_PATTERN = Pattern.compile(
-    TEMPLATE_METHOD_NAME,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern TEMPLATE_METHOD_NAME_PATTERN = CaseInsensitivePattern.compile(
+    TEMPLATE_METHOD_NAME
   );
-  private static final Pattern NSTR_LANG_PATTERN = Pattern.compile(
-    NSTR_LANG_REGEX,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern NSTR_LANG_PATTERN = CaseInsensitivePattern.compile(
+    NSTR_LANG_REGEX
   );
-  private static final Pattern NSTR_LANG_CUT_PATTERN = Pattern.compile(
-    NSTR_LANG_CUT_REGEX,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern NSTR_LANG_CUT_PATTERN = CaseInsensitivePattern.compile(
+    NSTR_LANG_CUT_REGEX
   );
-  private static final Pattern WHITE_SPACE_PATTERN = Pattern.compile(
-    WHITE_SPACE_REGEX,
-    Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
+  private static final Pattern WHITE_SPACE_PATTERN = CaseInsensitivePattern.compile(
+    WHITE_SPACE_REGEX
   );
 
   private BSLParser.GlobalMethodCallContext globalMethodCallContext;

From d28ae5b487c1aff879d3c5b603e9ac60ff83fa3d Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 25 May 2020 12:25:21 +0300
Subject: [PATCH 422/444] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnostics/UsingCancelParameterDiagnostic.java      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
index 432bfd453bc..f93bca323d3 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsingCancelParameterDiagnostic.java
@@ -34,10 +34,8 @@
 import org.antlr.v4.runtime.tree.ParseTree;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
   type = DiagnosticType.CODE_SMELL,
@@ -73,18 +71,13 @@ public ParseTree visitSub(BSLParser.SubContext ctx) {
       return ctx;
     }
 
-    Collection<ParseTree> assigns = Trees.findAllRuleNodes(ctx, BSLParser.RULE_assignment);
-
-    List<BSLParserRuleContext> tree = assigns.stream()
+    Trees.findAllRuleNodes(ctx, BSLParser.RULE_assignment).stream()
       .filter(
         node -> cancelPattern.matcher(((BSLParser.AssignmentContext) node).lValue()
           .getText())
           .matches()
       )
       .map(BSLParserRuleContext.class::cast)
-      .collect(Collectors.toList());
-
-    tree.stream()
       .filter(ident -> !rightPartIsValid((BSLParser.AssignmentContext) ident))
       .map(ParseTree::getParent)
       .map(BSLParserRuleContext.class::cast)

From 21d1055a3e2146b2df7fb4fa878b348c9b576318 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 25 May 2020 16:53:09 +0000
Subject: [PATCH 423/444] Translate DiagnosticIgnorance.md via GitLocalize

---
 docs/en/features/DiagnosticIgnorance.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/features/DiagnosticIgnorance.md b/docs/en/features/DiagnosticIgnorance.md
index 99674fc36a0..fa4732b679b 100644
--- a/docs/en/features/DiagnosticIgnorance.md
+++ b/docs/en/features/DiagnosticIgnorance.md
@@ -6,8 +6,7 @@ Instead of manually mark a comment as irrelevant every time, BSL LS provides fun
 
 ## Description
 
-To hide part of the code from the BSL LS analyzer, you must add a special comment to the code.
- The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
+To hide part of the code from the BSL LS analyzer, you must add a special comment to the code. The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
 
 - `Prefix` always is `// BSLLS`
 - `DiagnosticKey` can be found in the [list of diagnostics](../diagnostics/index.md) by description.

From 8c73d703973abc070f63d534244b7d7f2a1be6f5 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Mon, 25 May 2020 16:53:10 +0000
Subject: [PATCH 424/444] Translate DiagnosticIgnorance.md via GitLocalize

---
 docs/en/features/DiagnosticIgnorance.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/features/DiagnosticIgnorance.md b/docs/en/features/DiagnosticIgnorance.md
index fa4732b679b..99674fc36a0 100644
--- a/docs/en/features/DiagnosticIgnorance.md
+++ b/docs/en/features/DiagnosticIgnorance.md
@@ -6,7 +6,8 @@ Instead of manually mark a comment as irrelevant every time, BSL LS provides fun
 
 ## Description
 
-To hide part of the code from the BSL LS analyzer, you must add a special comment to the code. The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
+To hide part of the code from the BSL LS analyzer, you must add a special comment to the code.
+ The escaping comment is formed as follows: `[Prefix][:DiagnosticKey]-[ActivationFlag]`. Now in more detail.
 
 - `Prefix` always is `// BSLLS`
 - `DiagnosticKey` can be found in the [list of diagnostics](../diagnostics/index.md) by description.

From b9463f06bef782af89f81acc4e8a943c392308a7 Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Mon, 25 May 2020 16:53:11 +0000
Subject: [PATCH 425/444] Translate index.md via GitLocalize

---
 docs/en/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/index.md b/docs/en/index.md
index 8214d08c2cc..d30efbb429b 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -70,7 +70,7 @@ Usage: bsl-language-server analyze [-hq] [-c=<path>] [-o=<path>] [-s=<path>]
 
 To set source code folder for analysis use parameter `--srcDir` (short `-s`) followed by the path (relative or absolute) to the source code folder. To generate an analysis report you need to specify one or more reporters. To specify reporter use parameter `--reporter` or `-r`, followed by reporter key. You may specify several reporters. The list of reporters see in section  **Reporters**.
 
-
+Command line example to run analysis:
 
 ```sh
 java -jar bsl-language-server.jar --analyze --srcDir ./src/cf --reporter json

From 9c3f2965ef72c2985a3df837047300a904940e83 Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 16:53:13 +0000
Subject: [PATCH 426/444] Translate index.md via GitLocalize


From 99a7e08bb6e59f9aabd169ab97add943e747c457 Mon Sep 17 00:00:00 2001
From: Aleksandr Ponkratov <ponkratov.aleks@mail.ru>
Date: Mon, 25 May 2020 16:53:14 +0000
Subject: [PATCH 427/444] Translate systemRequirements.md via GitLocalize


From bfa79cc6ffbe5b8eb7416b305560eeb03bccfdcd Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 16:53:15 +0000
Subject: [PATCH 428/444] Translate ConfigurationFile.md via GitLocalize

---
 docs/en/features/ConfigurationFile.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/features/ConfigurationFile.md b/docs/en/features/ConfigurationFile.md
index 653dbc3db34..ee09e7a6dd9 100644
--- a/docs/en/features/ConfigurationFile.md
+++ b/docs/en/features/ConfigurationFile.md
@@ -9,9 +9,9 @@ Name | Type | Description
 `language` | `String` | Set the language for displaying diagnosed comments. Supported languages:<br>* `ru` - for Russian (*default*)<br>* `en` - for English
 `codeLens` | `JSON-Object` | Contains the settings for displaying `lens` in advanced code editors / IDEs *(for example, [Visual Studio Code](https://code.visualstudio.com/) )* , which displays various information above a block of code.
 ⤷   `showCognitiveComplexity` | `Boolean` | In code editors/IDE with support codelens*(for example [Visual Studio Code](https://code.visualstudio.com/))*, enables displaying the value[ of the cognitive complexity](../diagnostics/CognitiveComplexity.md) of the method over its definition. By default is enabled (*is set to `true`*)
-⤷   `showCyclomaticComplexity` | `Boolean` | Similar to `showCognitiveComplexityCodeLens`, enables the display of the [cyclomatic complexity](../diagnostics/CyclomaticComplexity.md) value   of the method. By default enabled (*is set to `true`*)
+⤷   `showCyclomaticComplexity` | `Boolean` | Включает отображение значения [цикломатической сложности](../diagnostics/CyclomaticComplexity.md) метода. По умолчанию параметр включен (*установлен в `true`*)
 `diagnostics` | `JSON-Object` | Contains diagnostic settings
-⤷   `computeTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<em data-md-type="emphasis"><br> <code data-md-type="codespan">onSave</code> - when saving a file (<em data-md-type="emphasis">default</em>)</em><br> `never` - analysis will not be performed
+⤷   `computeTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<em data-md-type="raw_html"><br> <code data-md-type="raw_html">onSave</code> - when saving a file (<em data-md-type="raw_html">default</em>)</em><br> `never` - analysis will not be performed
 ⤷   `skipSupport` | `String` | This parameter sets **1C configuration** file skipping mode *(for example files are not analyzed for issues)* which are "on support" from vendor configuration. Possible values:<br>* `withSupport` - skip all modules set "on support" *(all "locks" types)*<br>* `withSupportLocked` -  skip modules set "on support" with prohibited modification *("yellow  closed lock")*<br>* `never` - skip no modules as support mode is not analyzed *(set by default)*
 ⤷   `mode` | `String` | Setting for controlling the diagnostic settings accounting mode. Possible options: <br> * `OFF` - All diagnostics are considered to be turned off, regardless of their settings. <br> * `ON` - All diagnostics enabled by default are considered enabled, the rest - depending on personal settings <br> * `EXCEPT` - All diagnostics other than those specified are considered enabled. <br> * `ONLY` - Only the specified diagnostics are considered enabled. <br> * `ALL` - All diagnostics are considered enabled.
 ⤷   `parameters` | `JSON-Object` | Parameter is a collection of diagnostics parameters.  Collection items are json-objects with the following structure:<br>* *object key* - string, is diagnostic key<br>* *object value* - if is boolean, then interpreted as diagnostic off-switch (`false`) or on-switch with default parameters (`true`), if is type  `json-object`,  collection of diagnostic parameters.<br><br>Key, if set to ON by default and all allowed parameters and examples are given on the diagnostic page.

From d5a2693921bafdef4b08720c4f127ac91e2783b8 Mon Sep 17 00:00:00 2001
From: Alexey Sosnoviy <int-it@yandex.ru>
Date: Mon, 25 May 2020 16:53:16 +0000
Subject: [PATCH 429/444] Translate ConfigurationFile.md via GitLocalize

---
 docs/en/features/ConfigurationFile.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/ConfigurationFile.md b/docs/en/features/ConfigurationFile.md
index ee09e7a6dd9..1b7319f0596 100644
--- a/docs/en/features/ConfigurationFile.md
+++ b/docs/en/features/ConfigurationFile.md
@@ -9,7 +9,7 @@ Name | Type | Description
 `language` | `String` | Set the language for displaying diagnosed comments. Supported languages:<br>* `ru` - for Russian (*default*)<br>* `en` - for English
 `codeLens` | `JSON-Object` | Contains the settings for displaying `lens` in advanced code editors / IDEs *(for example, [Visual Studio Code](https://code.visualstudio.com/) )* , which displays various information above a block of code.
 ⤷   `showCognitiveComplexity` | `Boolean` | In code editors/IDE with support codelens*(for example [Visual Studio Code](https://code.visualstudio.com/))*, enables displaying the value[ of the cognitive complexity](../diagnostics/CognitiveComplexity.md) of the method over its definition. By default is enabled (*is set to `true`*)
-⤷   `showCyclomaticComplexity` | `Boolean` | Включает отображение значения [цикломатической сложности](../diagnostics/CyclomaticComplexity.md) метода. По умолчанию параметр включен (*установлен в `true`*)
+⤷   `showCyclomaticComplexity` | `Boolean` | Similar to `showCognitiveComplexityCodeLens`, enables the display of the [cyclomatic complexity](../diagnostics/CyclomaticComplexity.md) value   of the method. By default enabled (*is set to `true`*)
 `diagnostics` | `JSON-Object` | Contains diagnostic settings
 ⤷   `computeTrigger` | `String` | Event that will trigger the code analysis procedure to diagnose comments. Possible values:<br>* `onType` -when editing a file (online) ***on large files can significantly slow down editing ***<em data-md-type="raw_html"><br> <code data-md-type="raw_html">onSave</code> - when saving a file (<em data-md-type="raw_html">default</em>)</em><br> `never` - analysis will not be performed
 ⤷   `skipSupport` | `String` | This parameter sets **1C configuration** file skipping mode *(for example files are not analyzed for issues)* which are "on support" from vendor configuration. Possible values:<br>* `withSupport` - skip all modules set "on support" *(all "locks" types)*<br>* `withSupportLocked` -  skip modules set "on support" with prohibited modification *("yellow  closed lock")*<br>* `never` - skip no modules as support mode is not analyzed *(set by default)*

From 5b3f8162167b8cd3b5c2f7af2b759ff9cbd56ec9 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Tue, 26 May 2020 00:00:33 +0300
Subject: [PATCH 430/444] Update docs/contributing/StyleGuide.md

---
 docs/contributing/StyleGuide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/StyleGuide.md b/docs/contributing/StyleGuide.md
index c8a40db76ff..f6dd9754d41 100644
--- a/docs/contributing/StyleGuide.md
+++ b/docs/contributing/StyleGuide.md
@@ -6,7 +6,7 @@
 
 ## Общие рекомендации
 
-Если метод на законных основаниях может возвращать `null`, следует возвращать `Optional<T>`, вместо явного возврата `null`.
+Если метод на законных основаниях может возвращать `null`, рекомендуется вместо явного возврата `null` возвращать `Optional<T>`. Исключения (например, высокочастотные или перфомансные функции) обговариваются отдельно.
 
 ## Форматирование
 

From 87273339121664db4672a9d48b0750248202fabf Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 11:57:22 +0300
Subject: [PATCH 431/444] =?UTF-8?q?#1218=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0=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?=D0=B8=20=D0=B2=20=D1=82=D1=83=D0=BB=D1=82=D0=B8=D0=BF=20docume?=
 =?UTF-8?q?ntLink?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../providers/DocumentLinkProvider.java       | 19 ++++++++++---------
 .../DocumentLinkProvider_en.properties        |  2 +-
 .../DocumentLinkProvider_ru.properties        |  2 +-
 .../providers/DocumentLinkProviderTest.java   |  8 ++++++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
index 5d5870d0ddf..2728683f8aa 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider.java
@@ -26,6 +26,7 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
 import com.github._1c_syntax.bsl.languageserver.utils.Resources;
+import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DocumentLink;
 
 import java.util.List;
@@ -57,19 +58,19 @@ public List<DocumentLink> getDocumentLinks(DocumentContext documentContext) {
       siteRoot,
       devSuffix,
       languageSuffix
-      );
-
-    var tooltip = Resources.getResourceString(language, this.getClass(), "tooltip");
+    );
 
     return diagnosticProvider.getComputedDiagnostics(documentContext).stream()
-      .map(diagnostic ->
-        new DocumentLink(
+      .map((Diagnostic diagnostic) -> {
+        var diagnosticCode = DiagnosticCode.getStringValue(diagnostic.getCode());
+
+        return new DocumentLink(
           diagnostic.getRange(),
-          siteDiagnosticsUrl + DiagnosticCode.getStringValue(diagnostic.getCode()),
+          siteDiagnosticsUrl + diagnosticCode,
           null,
-          tooltip
-        )
-      )
+          Resources.getResourceString(language, this.getClass(), "tooltip", diagnosticCode)
+        );
+      })
       .collect(Collectors.toList());
   }
 }
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
index 740413d43fe..5d7cacaea74 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_en.properties
@@ -1 +1 @@
-tooltip=Diagnostics documentation
+tooltip=Diagnostics documentation (%s)
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties
index 3b3dd7d1be5..576a45e4989 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProvider_ru.properties
@@ -1 +1 @@
-tooltip=Документация диагностики
+tooltip=Документация диагностики (%s)
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
index 77c3f922eab..f34014ad195 100644
--- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
+++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/DocumentLinkProviderTest.java
@@ -130,7 +130,9 @@ void testTooltip() {
 
     // then
     assertThat(documentLinks)
-      .allMatch(documentLink -> documentLink.getTooltip().contains("Документация"));
+      .allMatch(documentLink -> documentLink.getTooltip().contains("Документация"))
+      .anyMatch(documentLink -> documentLink.getTooltip().contains(DIAGNOSTIC_CODE))
+    ;
 
     // when
     configuration.setLanguage(Language.EN);
@@ -138,7 +140,9 @@ void testTooltip() {
 
     // then
     assertThat(documentLinks)
-      .allMatch(documentLink -> documentLink.getTooltip().contains("documentation"));
+      .allMatch(documentLink -> documentLink.getTooltip().contains("documentation"))
+      .anyMatch(documentLink -> documentLink.getTooltip().contains(DIAGNOSTIC_CODE))
+    ;
   }
 
   @Test

From 008f043bf4afb66f52a5fbd061f946a59149b43e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 12:13:51 +0300
Subject: [PATCH 432/444] Update build.gradle.kts

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 12fd46df676..6dc30b27863 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     implementation("org.reflections", "reflections", "0.9.10")
 
-    implementation("com.github.1c-syntax", "bsl-parser", "4de6f367cd279c012a2a0b024ff01e7a542257e0") {
+    implementation("com.github.1c-syntax", "bsl-parser", "0.14.1") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")
@@ -86,7 +86,7 @@ dependencies {
         exclude("org.glassfish", "javax.json")
     }
 
-    implementation("com.github.1c-syntax", "utils", "4034e83681b")
+    implementation("com.github.1c-syntax", "utils", "0.3.0")
     implementation("com.github.1c-syntax", "mdclasses", "0.5.0")
 
     compileOnly("org.projectlombok", "lombok", lombok.version)

From a12863e79ccbdd34b005e0858cabd7965e727e59 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Thu, 28 May 2020 09:24:13 +0000
Subject: [PATCH 433/444] Translate DeprecatedMethods8317.md via GitLocalize

---
 docs/en/diagnostics/DeprecatedMethods8317.md | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedMethods8317.md b/docs/en/diagnostics/DeprecatedMethods8317.md
index a10793f844b..3dff7c36ab8 100644
--- a/docs/en/diagnostics/DeprecatedMethods8317.md
+++ b/docs/en/diagnostics/DeprecatedMethods8317.md
@@ -1,33 +1,37 @@
 # Using of deprecated platform 8.3.17 global methods (DeprecatedMethods8317)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `deprecated` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `5` | `deprecated`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
-In platform 8.3.17, the global context property ErrorProcessing was implemented.
 
-The following global context methods are deprecated and should not be used:
-* BriefErrorDescription()
-* DetailErrorDescription()
-* ShowErrorInfo()
+In the global context of the 8.3.17 platform, created ErrorProcessing properties and error management text parameters that allow you to customize error texts. Global context methods:
+
+- BriefErrorDescription()
+- DetailErrorDescription()
+- ShowErrorInfo()
 
 You should use the same methods of the ErrorProcessing object instead.
+
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
-* Source: [Platform 8.3.17 changelog](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm)
+- Source: [Platform 8.3.17 changelog](https://dl03.1c.ru/content/Platform/8_3_17_1386/1cv8upd_8_3_17_1386.htm)
 
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedMethods8317-off
-// BSLLS:DeprecatedMethods8317-on
+// BSLLS:DeprecatedMethods8317-off // BSLLS:DeprecatedMethods8317-on
 ```
 
 ### Parameter for config

From b507506035c22e45416b1bd77ecf15d2dba87f75 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Thu, 28 May 2020 09:24:14 +0000
Subject: [PATCH 434/444] Translate DeprecatedMethodCall.md via GitLocalize

---
 docs/en/diagnostics/DeprecatedMethodCall.md | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
index b1fb79443e5..4c3b60c91a1 100644
--- a/docs/en/diagnostics/DeprecatedMethodCall.md
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -1,10 +1,11 @@
 # Deprecated methods should not be used (DeprecatedMethodCall)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br/>`design` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br>`design`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 Use or extension of deprecated methods should be avoided. Marking method as deprecated is a warning that means the method will be removed in future versions and left for temporary backward compatibility.
@@ -16,8 +17,11 @@ Exception: It is possible to call deprecated methods from deprecated methods.
 <!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
 
 ```bsl
-// BSLLS:DeprecatedMethodCall-off
-// BSLLS:DeprecatedMethodCall-on
+// Deprecated. Need to use DontDeprecatedProcedure.
+Procedure DeprecatedProcedure()
+EndProcedure
+
+DeprecatedProcedure(); // Triggering diagnostics
 ```
 
 ## Sources
@@ -28,6 +32,7 @@ Exception: It is possible to call deprecated methods from deprecated methods.
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From c852ffa6c0a53e24e6b1fac571ac43eb6219a331 Mon Sep 17 00:00:00 2001
From: Oleg Tymko <olegtymko@yandex.ru>
Date: Thu, 28 May 2020 09:24:16 +0000
Subject: [PATCH 435/444] Translate CommonModuleAssign.md via GitLocalize

---
 docs/en/diagnostics/CommonModuleAssign.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
index a47d0787ec7..eb8149681b4 100644
--- a/docs/en/diagnostics/CommonModuleAssign.md
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -1,15 +1,16 @@
 # CommonModuleAssign (CommonModuleAssign)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `2` | `error` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `2` | `error`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-When assigning a value to a common module, an exception will be thrown. This situation is possible when a common module with a name that is already used for a variable is added to the configuration.
+When assigning a value to a common module, an exception will be thrown. Such a situation is possible when a common module with a name that is already used for a variable is added to the configuration.
 
 ## Examples
 
@@ -22,6 +23,7 @@ When assigning a value to a common module, an exception will be thrown. This sit
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl

From 995ed7f3b043cb741f4b5eda11fc17b3ca9e11fe Mon Sep 17 00:00:00 2001
From: Maximov Valery <maximovvalery@gmail.com>
Date: Thu, 28 May 2020 09:24:17 +0000
Subject: [PATCH 436/444] Translate DeprecatedAttributes8312.md via GitLocalize

---
 .../diagnostics/DeprecatedAttributes8312.md   | 52 ++++++++++++++++---
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index 61634caf52f..2019fb4c8b6 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -1,27 +1,65 @@
 # Deprecated 8.3.12 platform features. (DeprecatedAttributes8312)
 
-| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
-| :-: | :-: | :-: | :-: | :-: | :-: |
-| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated` |
+Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
+:-: | :-: | :-: | :-: | :-: | :-:
+`Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated`
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
+
 ## Description
+
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
 
-## Examples
-<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->
+The following items are deprecated and their use is not recommended since platform version 8.3.12:
+
+- Для системного перечисления ГруппировкаПодчиненныхЭлементовФормы реализовано значение ГоризонтальнаяВсегда. Значение системного перечисления ГруппировкаПодчиненныхЭлементовФормы.Горизонтальная считается устаревшим;
+
+- Системное перечисление ОриентацияМетокДиаграммы более не доступно. Актуальный вариант ОриентацияПодписейДиаграммы;
+
+- The following properties and methods of Chart object are obsolete and not recommended for use:
+
+    - ColorPalette
+    - GradientPaletteStartColor
+    - GradientPaletteEndColor
+    - GradientPaletteMaxColors
+    - GetPalette
+    - SetPalette
+
+- Names of properties of the object ChartPlotArea:
+
+    - ShowScale
+    - ScaleLines
+    - ScaleColor
+
+- Свойства объекта ОбластьПостроенияДиаграммы являются устаревшими, не рекомендуются для использования и поддерживаются для совместимости:
+
+    - ShowSeriesScaleLabels - recommended to use the SeriesScale.ScaleLabelLocation
+    - ShowPointsScaleLabels- recommended to use the PointsScale.ScaleLabelLocation
+    - ShowValuesScaleLabels - recommended to use the ValuesScale.ScaleLabelLocation
+    - ShowScaleValueLines - recommended to use the ValuesScale.ОтображениеЛинийСетки
+    - ValueScaleFormat - recommended to use the ValuesScale.LabelFormat
+    - LabelsOrientation - recommended to use the PointsScale.LabelOrientation
+
+- Свойство ОтображатьЛегенду объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим и не рекомендуется для использования.
+
+- Свойство ОтображатьЗаголовок объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим и не рекомендуется для использования.
+
+- Метод глобального контекста ОчиститьЖурналРегистрации() применим только к журналу в формата SQLite, признан устаревшим и его использование не рекомендуется.
 
 ## Sources
+
 <!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
 
+[Platform 8.3.12 changelog](https://1c-dn.com/library/v8update_2079252603_new_functionality_and_changes/)
+
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
+
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedAttributes8312-off
-// BSLLS:DeprecatedAttributes8312-on
+// BSLLS:DeprecatedAttributes8312-off // BSLLS:DeprecatedAttributes8312-on
 ```
 
 ### Parameter for config

From 7ecc27a2e7db866a0f91d231fb5dc31ded2d247f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 09:24:18 +0000
Subject: [PATCH 437/444] Translate DeprecatedAttributes8312.md via GitLocalize

---
 docs/en/diagnostics/DeprecatedAttributes8312.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index 2019fb4c8b6..fb8d6ab5ddb 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -12,9 +12,9 @@ Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
 
 The following items are deprecated and their use is not recommended since platform version 8.3.12:
 
-- Для системного перечисления ГруппировкаПодчиненныхЭлементовФормы реализовано значение ГоризонтальнаяВсегда. Значение системного перечисления ГруппировкаПодчиненныхЭлементовФормы.Горизонтальная считается устаревшим;
+- Implemented the new AlwaysHorizontal value of the ChildFormItemsGroup system enum. The Horizontal value of the ChildFormItemsGroup system enum is deprecated;
 
-- Системное перечисление ОриентацияМетокДиаграммы более не доступно. Актуальный вариант ОриентацияПодписейДиаграммы;
+- ChartLabelsOrientation system enum is no longer available. Actual variant is ChartLabelsOrientation;
 
 - The following properties and methods of Chart object are obsolete and not recommended for use:
 
@@ -31,7 +31,7 @@ The following items are deprecated and their use is not recommended since platfo
     - ScaleLines
     - ScaleColor
 
-- Свойства объекта ОбластьПостроенияДиаграммы являются устаревшими, не рекомендуются для использования и поддерживаются для совместимости:
+- Properties of FullTextSearchManager object are obsolete, not recomended for use and supported only for backward compatibility:
 
     - ShowSeriesScaleLabels - recommended to use the SeriesScale.ScaleLabelLocation
     - ShowPointsScaleLabels- recommended to use the PointsScale.ScaleLabelLocation
@@ -40,11 +40,11 @@ The following items are deprecated and their use is not recommended since platfo
     - ValueScaleFormat - recommended to use the ValuesScale.LabelFormat
     - LabelsOrientation - recommended to use the PointsScale.LabelOrientation
 
-- Свойство ОтображатьЛегенду объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим и не рекомендуется для использования.
+- Property ShowLegend of Chart, GanttChart, PivotChart objects are obsolete and not recomended for use.
 
-- Свойство ОтображатьЗаголовок объектов Диаграмма, ДиаграммаГанта, СводнаяДиаграмма является устаревшим и не рекомендуется для использования.
+- Property ShowTitle of Chart, GanttChart, PivotChart objects are obsolete and not recomended for use.
 
-- Метод глобального контекста ОчиститьЖурналРегистрации() применим только к журналу в формата SQLite, признан устаревшим и его использование не рекомендуется.
+- The global context method ClearEventLog() is applicable only to a event log in SQLite format, is obsolete and its use is not recommended.
 
 ## Sources
 

From a475defaccc8956b37ce13a0f15f131c71b9fe2a Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 12:26:19 +0300
Subject: [PATCH 438/444] precommit

---
 docs/en/diagnostics/CommonModuleAssign.md       |  8 +++-----
 docs/en/diagnostics/DeprecatedAttributes8312.md | 11 +++++------
 docs/en/diagnostics/DeprecatedMethodCall.md     |  8 +++-----
 docs/en/diagnostics/DeprecatedMethods8317.md    | 11 +++++------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/docs/en/diagnostics/CommonModuleAssign.md b/docs/en/diagnostics/CommonModuleAssign.md
index eb8149681b4..e7a57acc313 100644
--- a/docs/en/diagnostics/CommonModuleAssign.md
+++ b/docs/en/diagnostics/CommonModuleAssign.md
@@ -1,11 +1,10 @@
 # CommonModuleAssign (CommonModuleAssign)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Error` | `BSL`<br>`OS` | `Blocker` | `Yes` | `2` | `error`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Error` | `BSL`<br/>`OS` | `Blocker` | `Yes` | `2` | `error` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -23,7 +22,6 @@ When assigning a value to a common module, an exception will be thrown. Such a s
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/DeprecatedAttributes8312.md b/docs/en/diagnostics/DeprecatedAttributes8312.md
index fb8d6ab5ddb..f49d2e81c45 100644
--- a/docs/en/diagnostics/DeprecatedAttributes8312.md
+++ b/docs/en/diagnostics/DeprecatedAttributes8312.md
@@ -1,11 +1,10 @@
 # Deprecated 8.3.12 platform features. (DeprecatedAttributes8312)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `1` | `deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -55,11 +54,11 @@ The following items are deprecated and their use is not recommended since platfo
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedAttributes8312-off // BSLLS:DeprecatedAttributes8312-on
+// BSLLS:DeprecatedAttributes8312-off
+// BSLLS:DeprecatedAttributes8312-on
 ```
 
 ### Parameter for config
diff --git a/docs/en/diagnostics/DeprecatedMethodCall.md b/docs/en/diagnostics/DeprecatedMethodCall.md
index 4c3b60c91a1..744f13f2cb5 100644
--- a/docs/en/diagnostics/DeprecatedMethodCall.md
+++ b/docs/en/diagnostics/DeprecatedMethodCall.md
@@ -1,11 +1,10 @@
 # Deprecated methods should not be used (DeprecatedMethodCall)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL`<br>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br>`design`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL`<br/>`OS` | `Minor` | `Yes` | `3` | `deprecated`<br/>`design` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 Use or extension of deprecated methods should be avoided. Marking method as deprecated is a warning that means the method will be removed in future versions and left for temporary backward compatibility.
@@ -32,7 +31,6 @@ DeprecatedProcedure(); // Triggering diagnostics
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
diff --git a/docs/en/diagnostics/DeprecatedMethods8317.md b/docs/en/diagnostics/DeprecatedMethods8317.md
index 3dff7c36ab8..7aa3f778e98 100644
--- a/docs/en/diagnostics/DeprecatedMethods8317.md
+++ b/docs/en/diagnostics/DeprecatedMethods8317.md
@@ -1,11 +1,10 @@
 # Using of deprecated platform 8.3.17 global methods (DeprecatedMethods8317)
 
-Type | Scope | Severity | Activated<br>by default | Minutes<br>to fix | Tags
-:-: | :-: | :-: | :-: | :-: | :-:
-`Code smell` | `BSL` | `Info` | `Yes` | `5` | `deprecated`
+| Type | Scope | Severity | Activated<br/>by default | Minutes<br/>to fix | Tags |
+| :-: | :-: | :-: | :-: | :-: | :-: |
+| `Code smell` | `BSL` | `Info` | `Yes` | `5` | `deprecated` |
 
 <!-- Блоки выше заполняются автоматически, не трогать -->
-
 ## Description
 
 <!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -27,11 +26,11 @@ You should use the same methods of the ErrorProcessing object instead.
 ## Snippets
 
 <!-- Блоки ниже заполняются автоматически, не трогать -->
-
 ### Diagnostic ignorance in code
 
 ```bsl
-// BSLLS:DeprecatedMethods8317-off // BSLLS:DeprecatedMethods8317-on
+// BSLLS:DeprecatedMethods8317-off
+// BSLLS:DeprecatedMethods8317-on
 ```
 
 ### Parameter for config

From 81920c9b3aac1600f9842bf99aa7bce0d3f32e8d Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 12:35:14 +0300
Subject: [PATCH 439/444] Update deps

---
 build.gradle.kts                         |   6 ++----
 gradle/wrapper/gradle-wrapper.jar        | Bin 58695 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 ++
 gradlew.bat                              |   4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6dc30b27863..bfa1c470716 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     jacoco
     id("com.github.hierynomus.license") version "0.15.0"
     id("org.sonarqube") version "2.8"
-    id("io.franzbecker.gradle-lombok") version "3.3.0"
+    id("io.franzbecker.gradle-lombok") version "4.0.0"
     id("me.qoomon.git-versioning") version "3.0.0"
     id("com.github.ben-manes.versions") version "0.28.0"
     id("com.github.johnrengelman.shadow") version "5.2.0"
@@ -94,7 +94,7 @@ dependencies {
     testImplementation("org.junit.jupiter", "junit-jupiter-api", junitVersion)
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", junitVersion)
 
-    testImplementation("org.assertj", "assertj-core", "3.15.0")
+    testImplementation("org.assertj", "assertj-core", "3.16.1")
     testImplementation("org.mockito", "mockito-core", "3.3.3")
 
     testImplementation("com.ginsberg", "junit5-system-exit", "1.0.0")
@@ -243,8 +243,6 @@ publishing {
             artifact(tasks["sourcesJar"])
             artifact(tasks["shadowJar"])
             artifact(tasks["javadocJar"])
-//            artifact(tasks.shadowJar.get())
-//            artifact(tasks.javadoc.get())
             pom.withXml {
                 val dependenciesNode = asNode().appendNode("dependencies")
                 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2faf2fc91d853cd5d4242b5547257070..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644
GIT binary patch
delta 12524
zcmY*<WmFu&)-4PWg1Zgw?ry;e?(Pml2ohWeLIx+u;O-LKodChz-Q8V-<mKkQ`>pqN
z|ERss*;ReIR@Lg&r_R7IT-GRDbpR4NMKNcwFgy&*A|eco1PnBHRth?SBneiw6$<D$
zj2b_D+#Go1+yQTTozwccAq$W~hgv)*S`J<U4lJF>UT&^LVJ0?Naa`KfV(>F!Ez}~S
z<hQLzRZ<0_35a96h)M-NZIgrmIij%O^x@c3!?yPZQ;AAq!bxNc1)R)AyAa@ZP_YJ>
zlOYq6aStzFT2F7{size`n1b~%1B9xgh(cQ9ouyL|ziu6RAcl6(E?jvX<y|EDtC#Mc
zDNq>gwR(0FL^kSHIAmZ2s5isHjbOdWuQUYDpdLWmFuhm?vlv4zV|A%2mAzN+2!7nu
z^<?kXp@Y(HOyYz!SDW@+m5I>zPm!e#s+)VtRH`+t-Z39c3+-Mi$be&im9BY_{*JNJ
zN|P?NVTKne(FxgaHpHh5NwRulGTjB~!XGK(w2U5>j1FxU#-nykK31nv8r&Ko19u^Y
z==&wL`KbFo&P1FF@B2Pk`sF6MNPcl&Fzg=5+q4#>EumkiHi*>TpdZN>g^qu^Y)l@H
zjxl17fOOp(Sxm_$vVwI;)8ap_Y8lykN^K&n>K7BO6f{?Ip_nB4)izoY8OO}9!?K<Z
z$e>g#e#%8V!@tk{)uVokQx*VMrI#Y!-D6HtbJ*cM-&FunOyS~SWv$ZCZ^|93Rt1qV
z`TOJ@zq@Z=<WT4(f~(T^B28v(4;p#5ZZ-H4Q>i(f?zK~=D+7-EG4o8gGnPYZ9lGr4
zXLwj>aKiShW|@MK2gv@DV!aZ%iGfSh5Y=`LBuJPVdWZ+u@EGCoid-#?xMH4tvT`ij
zS%&=*;Y1K6Ko{!K3tCb5{AK(hDM6xWz8OTg^M#?_JHU8cjg8(`F1@MrGilo_s<9h!
zzl2|IuD%MYF_?Gki=7?XP)jba(*3J|_%(&-SiDI-Z<Yb9;vE}x!m(jU(sUA5XMVeo
ze4`}&li*W8kdI$D^d~9__&IEnfbjIk&nLF~f)C&BiAJ?_KY1Yt4W&0>(pr}YUSmap
zKySF5Ew}MkY{yiw<ve}I6sYkVlh%J&&HX<v`K!u_<zR?y!v|=bYV@W~@-3omGt%I-
zN!-Tr7I<_V8<C&6+g<6QlpekQP!CYc&xlSf9Y4pL9Z<4$6jwcL0y}?8f#Cf16`&BL
zztv8W7WQ~#14^c-(7OHD{>+1RoJ}D#Q(2XB^+t;DK^(rq0H~VteRo1@*0hB4=Qd#g
z^>en{wx`u4qU>d|!k$3fCz@-Jf);(GJbkuK^pImgvbH>D15_TwR4QZ#cYvygmO!wE
z+0ahMz<fj+lURRFESbsQE|6B)Q5PXvX7^^6e}{#4c0p?3-yVWL;EK#DJz98h<E8O>
zGrboqVr}<^qNWH3j|>Cz{yofp_Ww!ZGb<647+n&qiX(w5TF2^OY*1d-NOes~;i%r$
zS7m3fB!?C*&r8D)z6G+QKTESNPE}!j)%{H+je~tVMsD3+hwG5T*oq;{{gCB)-r~yr
zGXN|Me~GC|s$@1V0j%TO*GTbnCPraoDXO+=^dw=~sSJh}A!g<~=ZyOKK2Q9om7EuZ
zHN*-mGmr3V&mJ?pDRYf9cl|0emda6k-mAG!+id*ROoKm|Z;vlw^`yexO;cK^#Dx`4
z>bE;Ck~Wfe8|!<`9}07q#1RWpTb_7M4d1R!ha7PgOiYE?)ofDi-*-sdR%+b^8BtJ&
z$W*Dl4vM*mVK0-TGp#gFRBuMJv>Wgl8~W0MLt0P*QOAo;OVac(lrB=CT2qg5)WP!8
z&0RRZtTaz_YOH_zZ{QF22lGT+9%28XQ)x!!7>bXc<57NyW4vDM#|hc~V@xM?KD(IO
zJ33fIRLjY^tNv@_w4q_qI)%ekJwCQ|p!!rBk-`8$J>N)x+`@|w{xN3ubcrx^vUYkG
zY_H6yLKkmh-qsUKu3^z;K_?=br#w1SCjZM1NzW!Whd})Aib#X)*SR<M&y9w#ybkPa
zQdV}2(!cBKb2oqvQf|=y%q<z(`$>J(txRS%O6qwASJ1gV{UKwb_zT-qAa(q!#6dQV
z3lBx6SQ4GtJ5B$igL(shQ-|iNRnD9XzL8T$3!$R5h%4@9{N%=xJ3wVmHyYeX(HqSF
zUNH&O7o$@cFfc+CFff$=`F@Z>W9Ht0EA)}PhzHyQVqj_%oxR`3Gf333=+XDh#Jk7W
zTEyki$hAwyCQ$0fCwIkvgSXh~lMKaKiNjfPv3Ls0R0PHIDW8xuQqy8Fq{=7Mhfg<u
z^eH%sYdnf01EptG`qG-e5wVB|ezPk!eL||^c3N+L*eCrnT50k+#B55Jr~DECX0OQE
zxY0=IG!9z7h};*>dxC?!O)8T8rsjOK?7lNjeCt&ND}ak8AKDA1vVD)(57|3zLBE-&
z{7f%j8tmTs6@`zS@O}$J0yYc#ZXZkxr2lLdCLfXa-D1exs4~6QC7Tq0)elYkZZ@QE
zF7mvUdH!q_CLg-9ztX=Z+r71c0X}~|7XG=LjyW7aew8i+vCnZQLLbX$e^~8vvHOP@
zGqrUXjg!fl$*AE%v?0vx^{Jf|wFIh_xY0#l61{X#<av=7dK^qBfZ2BV5jJsl_>n~_
zJc_s`KdMdltWA!$fezo2%ly)lzh5CII_Y{B4#P@xz>)1~n*ev`n5wS8(+ge|!zZ{V
z>~eQZPHHU@xr)gAJ}u$t+KyOU26&yCThUBT8c%GA{AKMjdlfzXpCz9?5<N>+i@vlC
z3u|{8?in-vlwoQAxV47t$pPw??x_~q@nNzqNYOdxl)ZCXUAN4V?^PCEc1pEOic@eO
z&}f8}r6ZTKoj6lj*^%u5f0uDvfv>SCc`$R@*jmT=Wek^VX3D<Us(M^}H{YB^_z7)E
zhlO)~Tx$+Qr_q>I9eU@rtkwc8t+lkfSg#Di$=!@&qeE{EI}R^x1?M<zi0d-A<++Mk
zwMqAy8QYpVIq4oy@MI98-n-qQp=BK+d3Yj98K*4a^laZXD7^)NE7yD#xH!DG_ZL$Z
z2d*7wfS*X~ZtYg>L@keo3d|ckM&$K=n5~wn5-OS8hM+OyapNd83<<v3vC$sroCjM?
zjO$U^Tv!~JWDk68Sx;A7;uzgM=gH@&EfP-R@R`A(4&g0{=|$TDbLS0&x---DqfdQ~
z8Nl4dyGcdG8S`cZKkGL>+cdct_9{j7_fIEr3bz%k7~g#@WwJVn(-ifYUWx{~&r)$7
z*L}eWSrg*HbgS<jo$sh=rsQSt;bBsevd62VLdcgL{!U9`JlFRr4#wD)T2@2J!sWAy
zEr&U=j%19bgpjpf+W;zk8P-<Z?O};rbZtHZ2W?yyA;-5kaAG6q<jRqn(<X*Mjw??P
zn_Qg6m1rJR1VM&J>kKkhL>W7mrKF7t<3PseN?7OQCgq|oM)l?3Gfx2tJBd6R5pvJ%
z@h>JfLP5ml9JfeH$$dFCE&+Tg3>jJ)ze_l+`fQ)7+KjhEkv$pPb+`PHFLVV`Y`=4^
zePHGwwh;z{Ww0pS*vwCCBOO#wINifcLbD=dY;5~O;)AkJXyO3tasg4hSn4QrvdZF{
zVOd;_j^_%}R;(3e>~Z;pljR<x)pe2OWWUJxv9_%d{E|3<p^fvWB#*pOTnAo>r;|+m
z!<}(ZJ@|8biIr(v_ahw<x@LR=XFMM{E=Ojw+re_Mq^*26a`@%i7XYPH9xIH9^t8(w
zU&wWqp0<!d-%3)JqMU;k6w{}_zM9xHPCy@BDe_oR;SzbdIxZ|CKc7q38OEb~R4Z$r
zQ&XRzl0y^HyQTv#vxAljVzvmgK#<;zEs+_VIs}L^rWNz}d|R)a@~-9eNifrY7GY@I
zM;ix=%k2gOJA&6sr(}GPu?U;atQ0jUk{8>1)_@O_?nOyY^`oL6A)6+UXP)x|DIkWk
z+>Qj<^da1Bxoq-LME@^8Lc3JvDRd+r+4}0(AY2HHjsWfM26I|<|HsD?S<{>{pg+_E
zLIBws<8lCQ3=BAb7`JTeA9(uK{}3sAfCY}GMosI^M~(rBjB`e-BDaZk7h`Uwba66g
z)<>80xJ1(vUKyr@rgr*q?d*<&-e*i{27QIF_MCp}De9LG5Vwqk?JwXcS9X=$nV~{w
z-hct9W7XBwP?JWE80g2&pjw#Ca?t~T*;{paf}t81QOC|U^{i&L*7h$H9ZU{B%;4kJ
zY8##aV!B7lDG`?T>#)NPW1fRLW-^G=LAOZYU{oBO09;PB*_SO7kX#oZocx*s5o|8B
zQ-$B90S}Zi{Yd(vQiKxfiE;bR_W>b9!{XyJBH}X~wgg-sCXhpwSVvs7Yl)HiE1UpF
zaJ;1ac>=PTx>>eTs5maftWS3OE4Y|;lAJ#<+d`k|o$kA7Z%8h_R)LzWK@B2l*S%Hr
z<RQ>_;SnHKbhY!s=B4M*ia@o)N{aoRH{k0=bZ-W%KFRmGOQoHMOQ=c@L8UR&R6P@6
zNrIc$@uMo`ER&!5PVpn?(aFx)>Bb{Ed&@TR@rxosQkQ8_U{2O&L18Q>B5*iu9;>gL
zVbcUH8p(&ta*=KV8p^KmwE3XO5J;4ePKp!lOB!-U_|nczFKZGqjgoMz0zH&&RvIoR
z6At$sI_g8$MW@42qd+0^F!6vLXU&F$Q{3*w+@l~YJoa}(72(ZtL25*|Pqn|oi6ShD
z3~FtI2s)^0*|xl&mbFfnwZJ(6pMMy?t*A}TJ$eU_Z<fPP!$0g^crfq7O+`1quBI|e
zAYMD4C$w&vJr}YgLd+5v%-G9M&hsuYz8mhRp3=Ix3{fW?ZT?vyH83(puDc>Rtggg{
zz?!f$ObkJNP59**xu3J|e(x(2HM$;BS|B6`Qhi{|S16fd#jLBW90QYHaTC}~^p@I<
zDhz#k#!5*1tng<~(3SrquI%e-Wb4n)+gGhoZOgXso-WpO+PXu7(_fYEq7bK>*Cqt)
z{liy`k38cM^v(xe(Xm(iPJ*Y=8TDiKkLE5F)X!NMofWTS3|4`Z_%#i#4*`!z$u>>2
z8`#4qF&<&&pVeE3N}0f$b(emQMt&W`8hwTyEO;4$f+$tDuYl0&Bo-ElkN_kdJ?&#)
zR0sbXY6}Wu%MILxqleI(AUde02vX;mhKT-tY0tJiCAvUkGdSnA{!fw&eAAXT*(WL&
zZrb(MUMoOe`o`?*n&9J#?UnGt#nYp<FgS&0G+W6#CH8xn_$F8?&P6J)@atOux3#VB
zD~xk-aipKxlyCxHFDK;>zpBC*<-upSYh~ICBZbR9jY@iF60k>Cv*mt+Ek|<mdf|Rl
zC6EAU@4drkT#0-zTl$R!fIi&FrMJRASbQJ%{lLD-k8{SF{lg4ih{k?<5o^aBNd}f;
z2A?WrfUttV&LQ{(lmM>5K|c|&jja0YUg*K_0l2EOA!v#mQJ&)c=_V>|{+r`O?T_Al
zr_|LmH^hn@4o=#VuP+Hy#IHP9iBlj0S=&R006+8{M3jD~zQ@l9JE0r_&330a?52m$
zz0b*hAC5(?kRinc?F5IM^)Z$_(tEr8b$PjQ>1p)gRdQg?i})yOJ45+G;UlD5U~SZ`
zqfgAs4?{}4no}fg>stDRmVyX+QoIRq$Rm1trFr}?5LgvomixriLi}=GrnSx?ljUqV
zL&K;mk08|-^|m69mEDzl$2Pd8G*=J7pVAR<BCaSrn=TsDAM#G0-}`Jp-(*PVdr+vH
zM_=w5904YfA87pmVx6MOegJB(7aTKA_lU@AFO(Q8ZpSxjjoh7G_Nf@iwG}wBwvA7{
z*6;2?C_YF{NXpE&v9(keF-q|g{SaNHXlymJiP3LqqilkERbk|hHICoVMC(Y-g0|Wp
zdi#*;bdvk?GYm}q5m!k);ql(}T;V(4YrO9Nv<n`Y?BSchWkpt<+UCGrP@axA`AILO
zxUz~C9q>T&v~_L$Ib!3?@LZS6Eq$ZI%>Q$Uqh}WL>p3dI@-V^d48a_qcGUUeamAvJ
zeoe)&>A5a<JyUx_-l?UPQT`l}!40Lsi=e@YVRG)BrWX1A=ahmFV)w*IX12o>rjsAL
zbw9wB_E@|sS|We2raAUHE?;O3=s^9AKSJ1Jm){#0@44IGtJRshvsMnOjiAg-m=EuL
z8k@{~yG}3oJ;GgI^F(*YYil=yQvXvK3%S_N)hoX7vC+mZeeu9!1O1k3c3+pS^i|eS
z8AKU@xn0%bf{;~JbTRp9P(Wk}L+oe&$R0O19g)27&hDXmN5X0y*4dp})i*Y#WA>ZT
zvh?d<yj0jO3~2%8vIOpLjy2U#M#+b123bB*iBvKf$ZBZ0V9@(@Rq}kS-y#A<3<_1#
zgbrad4|ZQWF~S~UX^%p0Vag+>PTa8Pd%e+=FW)IRqtJTeh;|t=_6bwy?@l1b(Wf7R
zalDpGayZ=l!`LW)#ZSJOi_0L~W)@{jO`t?G{(kSF9o|Ay{>Y$h&c2bCU2G~I(xFmz
zv~wGohu*@P9CIl66lTIlKH?>O`-<IS1}FS!#2e+6s{@8z+ZD$@{sZI`m-l)_OAyUk
z8@WQwu2?c#=a3t@qhwMMxublN6T!p+%pYr$c6_jBG1SoN2<&I3eG2rRS+ty@5!5W7
zG**Xv5RL{^vi5Dh1R;#^@Od+nBFvRURLP=OiolDZ+=8<5GPgod*T(ETwjS_b&byuX
z14yB>-Yvcntv#I`(a`#f5SAMl3P)9}OA*vz>U!i!I)D*kcUkpG%*+7|m|FvUAc*)?
zq__3!ob~o6Xs{%^AmPt4SfTp|K5+1=u3xw8VnQxlvK&;#1yg2f_hejK4db{7_CUg^
zF#raQ+bjiPA7%26aP?V$#rta#g(x8Kr46=%JG8G-B<yTBc#&<GLSneuM_5_GEWm(_
z#9Ay*LE1xoJ^RkARd%87ZC3!C;KSjH<#;lp23Cb$sD-@qqg+U~<B*c-Q0_G6{BYVY
zaC*H)45%4f8%@EmJ(M$S**Ie#uo5`6za<@;^fwc@#uM@&Vpa`Hd?2X0ZEL~xOg9Ws
zBsdKBN~An|Wq90SxC_O~-}xQ`+$550DP^cCWGKVOT|iIhr#$tCq2&dC|LP4->q;g=
z_2N!0QjJSe1p_eJG*LE{o<JMc_>JvPghdh>Q&)c@;Nv){J4p<)=!Yj7M@?|k*~#!4
zQHEi0%Y0i_t?tzvH(ZpvPCG-0aLcO>H&7fWdM<(lFW(nmHKR-qWjCk!+A_ue6{mK9
zKw@RZ4XOhWOcs9ndh;1<$XZLYoH3R>GRU^`<%8w%F6S#1;1SyaOvL-3-?f+cRcR@u
zDIkB;X0^`jihs935{~B8;DaVpI9N$}dfhVRh3=B;(}8EMG|fKe1_R6KeYE_i0Z2n9
z;WA&-MS)ksvr2gA06~?ubzt0|bG60jkKPPXJV+4HfLq+3^td`;VyP_yRUBZUpj$K@
z+eB-Y5hRmHPaynxj(2shG9THbo060Ep;7EpY#l!adXQ;y+!SWmMy&76R?4Gt3%}Tp
z`=;GHnn0%C_&$5Fb$EdwOKYOn@3Sv$fuNqu37MjoY<E0YW@mx0KbNKw_}*aT|D6=@
zu4^Y}B!gc>ji-Sgi3)>_|C3D$*#I>ex2{RD22kYrDH<{vBBx>Y5z0r=$*^-MUpnfA
z)K<R^I+ndrJ2g*A=S}r0vcIVJbJr;vDxmQwPmC^QJ_uecrLKvA!7l){9%?w3U28oR
zHHN`U@gioSh%ZLGvEuRrz+m;e$4+JwKKrlc^?tn@t|K5lb})&qND&I+s>@2&B7WyY
zSv?g_xwChN{aL+8u}Pt}Pjf`KpZ0^{s(TYU#J_yH^|I0E{JF<=anwZXU>L2+9)YeL
zgUpE!Vhc%tm;mRd8iCJRR^_L&eJ38DRlS^^vdWBj9nN){4+cfrOBTkJP6AdM8O;|5
zvo4%dj<4udz-u5;>y(RNRJ$LNHin_-+9X9^w;u7f1QEY4+J@P<UJz;svpSMH-PkN9
zbZgV2l=V?bQTkdpTgiODZwrivcR+<b6a(7k@FFdf0Nvi;X(yI7{N1^%rx!u>qK1RD
zYjBNJlyr{UN#W{7+~!o)J>t{7xaY@uwtB63)HpcJVAfw!A#MvR=^fPOO@wrRV${>M
zx=}mSk$kSG2IUZWM&yKf=osidb8r-vgn0fYl~j8@_1}nZClq*9IN2_$k&KF4h{}7=
z`Z%nh!SB8K0y*5jV>X8mzLV-<vsMQVl)T6VJmDI2I!7EPqti*zb`|B;5Ya5M$S!3_
zj>B^)fw$3fY_P{?mH3Er$wi;4M_qw?9a?Y9^&687s*`#2Zj{SA?ll9SnBX_^!KiV&
z+(~5JJlbepI)jmMXN&Tt6FZ_Agf_IHy{;)gDd@OgF&wJBU?bsrr^>=FJU!Z(-@Xr8
zZzo{0yYsc_j<Vq(K4)lihSo3p|F**V#&=Av2K-++&Rq|Hb3QH%3>zy93<b0rgb$q%
zCj^^&v4nr)a6p%%U^f2<uz+IH5CUjf&}NSnuj8Xeu{YW|k&Npr@ER&A4D6?LDvS@m
zR+P}#F)c3}7$)0){#4PnM$qQJ91u{b{O6!Eb%@6M{p0f^<axdAVbyiwTI?Xp_aO97
z%LO48>()<15c`3mCdC-hv{GD=Gf7(MG%k4Ppq?V}i`>o;*><)FVFATNY)$I)DDt(#
z2hB9+*n`Ve3ewHGg4ALcm)N39zg*KC7x_TNU^jwfkP%tIkr7rwTZ@Jd{;*+UJL|NU
zOKcAb@-?;zut3O!E_<X<pK@&Y$}MUF{gNrV%-YL6c75bi!A%BCRpLR5L;&Ifd^1=_
z_E`G2yQCg@0hI~)=FM)4#7+oB#cnh(o4i0<4?Qz_+9AG3{?Q?+)DZBZa<ufrrLKPk
z&@S2~TwrM%YyV_CT@Qccy<T|b7`?$-MF4-~7oZx;cMSoW;uehc_)`<ZIwr>OfpqLw
z$qLRK>{qdNRnFt-unRJ$U0q^5T)_-ozPm(;HrBD0BpA+AgKK_60*wNUOiQpTLpK^&
zB_DUzDcr-g+nSw3I>vnqy{q~!P&A^_3%q|~28i#B@N|mEB~6<2kS8FKV_S=n6!7<=
z8Be!&>)O3wMORr(6K~6}gvp+?jy8%Ob2}Qit5c`)K$UXc?@m57@;kOU8-t~88Y|Em
zR+@Mn99x|g#~RU;5dI!vB?Gn9sn_-A91P>U4(yAN+>y2jnmh@o5{NeamEP>~>SpRw
zY<TF($A74d*u|u2izZF2eKydJw#Vd#I}6Y9;xVu19`m4f&`Tyu)^0^>D|<)PZ;;>P
zUAgj&wS^~zXYKTJWKn#a;u!cYu0(%k-i8jE9@U&{RrX~^4cvodc3_GV{_(Uy>4MQ4
zrDNRy3XL>w4IVN~w&PEw<CWdE(PWypH&{VMjX=cyEbA6(F0(7VcGS>Db-AjvkVtAO
z_1i4n8rayv7GIyL(_&ve<K2@>8aJL`y%;C$=U%#VE0?F>KviisLJGEJ61CQuEFm2+
zjGIsJb85;{!XdqPnW<dvY=EVKw9t$h_s8!sr)hE)y_A%6ve~NblufP)w5EfW<SRs+
zMp??shlWq6baYD0Gu;~=E9IK}ekFB<FR{+V15MGI%&J-OAl|O<S%zHkilv6P9KCz*
z%*uG@rYNgNSByt?kHB2MQ{+KT!n0q!IpK#`LM5gh6!o#%s_bzlk?blX-O}WV+eJtL
z!9Axx(5}uCq7#*<>89qF5if`vyLr%0Ns&^DqT_z($WwiHY>aLcO^<Sfa7R~7J>~=b
z^><=8l{;qZsYv}>@K@91VDt}SrhUq%E4}1*+)NxDzrL4gF$3$_(yf%sHSJhB`SyNo
zgp$4y#^~_MCJ=o^KS2v8MCEt4>biBe{YocdznvCmQDt0lH4r+d6k3JN%s6gr!lhFK
zW%@oiZ}EL*6Fz@Tg-9JC(Pc<_*q&QkJc{49ZH#ZlL6<tHBv`%#=rN#KdHg{FMUMWA
zO#a6dwO)bXG!dBpGy&2_koj$a@DmJ!{7mHq!o36MCjLx>OuT$JOz)<hqZ*HDwE*kN
zMc}Z*hCT31g-dz)EIc8zugt*5zbAsIvEqHZI*r)nk)sUN1m`|JGbN~n4=-FOqdI(=
z$P&q_mjnwvy-vMN=mgB0Px+m;LW@5tOOdM^R>PPIpBua#CPpfa#7ycAG(~~R#tT!s
zI9N{3X==2h*we-<hrl=)wGr{st{Jf1!{#O_m7XDJY%@>JBe=8RbbYXFGR(S!IS0N1
z*;M)-WOJ@kD_xRKV6%yuDmu$?5`s7zkoC(=WN9k8;g(1!yW`Dk1&d9&@~b1>*G7Cv
znH$jL{QJYOEULib)W-N6*~kxNitMjE7mpXqy`qPmYn1jhRVlJC(A!SyUbS}3c~|F+
zn<AplX+Eh|l-XoAMOCD-P{CHm{syKiYhRa{W=XOcs>U6WMt(r!r-qy`EeSFHvTNZm
zaQz+i<)j3)3XlH4ecA!K)u7>}orPXy{0lmfGz7j7feaO=gKm71(W`0|boBj~<p$A;
zuRuDH1euMkDWncMMC;+<N(h~5gKj=iWD7^0x4xNVIf(8)sU}lLzPHsXx|1K>eq;LU
z6$bz(kAR)%DA_u5Owh`OBc@h^VrEcwKmXwi<9gLi@sn({7&SSfTW7e_{8ODDxBXy~
zIQZGZ{9Z8AY0EHIvN9y>VIPe*k-^WcGg>SrXM%JL$-+6X(oYyHaln3^?DocGT6`n%
zhWsVQmniQ_*ZmC$Ha?K@3mxCsbW(6F9uIwz&AiAXNM#dJ9U>lQ#p^+dfTHxAA#oFZ
zr$6Oj(pd@X{UzIuVTIqg@U5T@vi1Ac1WeqBvxRPTUA+|fS#X)aB%|=eFpSAkuX(J3
zAm8wy?TIWi#`)(soFC#00zEEOhX=MIO;1e|ebD&FCzI%l8SmJief3wnz{nF+#S|NN
zjJ8q0!Shp!N_O#zdq5!h?9&Pdqvu&{E&X)S7hi#?Ek52=^RAXN*NC0IEBwHfL@=Gr
zEu<|<am=|4)c>my>m-SaVil*R4Ih7C?x-sQa>n*c)-r^kdHxNhXH5rybJodmdkAeH
z3DYT}Y~>I|4-P2=Ab*TkTfsi*-aF%>b<o3P%|r}hYcTThY5t|qYev4JK--6-!r7>X
zi*kV9Y(8r{x3z8MA_7(WrC~fA3!cfmvo>s1Dc3Q9O?QrFy6;Cld?D?`x*Ox@Y%JRL
zps}$z!9;2eRl`HI-2jeo{iZ=Uc`^1;Ke)L1B?LBICkui*LI@8x`$UuV-O~ILP79X)
zM~-Zcuq)GLgL@w~gSQBCGW)_)Xc(`vx7NV`;nwpvn1CO?)&sa-mfABpGr{0qRpk8Q
zf~TwZg|&&<<EoJ|?G~!xwb@pKvO3N}f3yZ|e!627Uro3Lgn%n=>f(hX`}b4ok%o`4
zOYPbsND^AYx|K4C&&k-_evu-T39&pK5CFxBZ*H~;S>ucdKlT-0p$PpPWCy*}j#pil
z3H^x&L$=6@Kg>QYybx!CN5DU&<c|%oj&5z=I>y16AK&8sB-C7{)G8k=(A>T1uZp<V
z<M73l92D&pZLLz){4wn%1<xIk->PQ*={E%+t7g2U;%8WpeybJaX6cTKcNsb&@8|xY
zTRH3l1@#+}1iHG!8>;L(FV9=k`ef{E^v2Dh+TU_sarUSSHn7d$Hi0#?GGPi%*+6!&
z#p&IvjxuTh&$N5FGy3F&@16Lmd=U%>dFBe?Cv%dIRvxykmu{6o>+_ik-3&Ez-V9~y
zmk5fOZc8VL%<CSxeAD*D<r%&RNBq<D^}vO?q#gth-9Riv{<a_JJxI;6Mz;cc09+Cb
zgv57Oe0I%?d%tsTX}}A@COPHCmkn)=T8>c~YiA*>4Fp0YgHOwO;WR!kXGdX|NeRR5
z8gGLvrIlg>E8%Frn#3WrXqAN5J0f!+PezB4Gz(!t<OzmSV#VwZfgb`j9*(=P!f|m@
zku)ckYkVpdZ|DuwCD0i{o3;UiMeP@du}(evdsm}Ap}U(*elXDz%8AeB5GVe~?<LmL
zPdG@#lxA*Dl9clf#7V4VDKvW~`Ee2X4Ap$V!_>0?W^NK%egC9_iG=(?Rbzsm-blw-
zLoT#zjR}#c2X8$?D!dg#(mdAb*cbUlyZw<%Csr>mUqB7(EfK?r@B<}S@|7dAjn&0d
z=+c?)*S=CLoM57!S)waxk_OOhoQ-|>2qZirq(IN0cg%hE@+@}VQrcmbbP-j{Vc+UH
zF9V+U8s9zbdGA}fXaA+z?<7SZIP8Y#W2R4IAWH91NJ_z=a_Y*jj5M^iGzC<g>2QV{
z(JzM1KDr~B+C^#_#fzHAv!mLEhu;=(zud(ilISbm=YrF|3#K|Lwg%d!ffW=h$DO};
z*e&VpvN`*@-hV8~2%2L`=cV(Boktr2r}BOQ87)j=2H9Nff5$Ovl~|LcBSmd78G$H#
z>EOMVbkInSTTQ4Q{ar#7Y>0`nvtv`0`9^Y<?EsiEV>>{eB461t`Vtxv$Gd-B#-zJ|
zwctztwHjQ7xDqMvYR8_49Ty{c3)>o%!Zx5w<{yi^I}Uq+@C7zEOLzLiU3)}j{|)M-
zi4?iaGpC<1I=YF-K_c2@bFBn&BW~10@yB;^Vv;z+!!fZsIxgQ{tP?-lZJRgr3{0ue
zi!HaL5EU`H;ajDAtScpSx;Zk4N)Qw|!nu{Fx}yVg)%f6)UeBfv?nzv@yNUWpr{&|)
zpiMOFz4Cx?(uS0+A10;ScXfTG)&rPI?uT}w?8Sc5e|rh$DJ*2!#du;GW=1Tj&Mx{O
zC*%1&z7AI?DaaMUs-l3X9y6X@<BOxS&d6{}l4Fjl1QmHj-s>&M8EKlU73==a%#p}H
z#4!YH!<}<rd*qsvrpSGS-~M!@GkR~a|2ZXir#T;EBf1kt_MSjVSRq$An5U!AFVKd^
zTgU5$ex?a9*D2|=UcpnxwR=*W%G?fFHw<|*z`FKE&fP5!miqbQw0H?ozUqENaqy40
zj98}r8EJv@2+UaNy|>OI$}8nX%?e2U0~!R}4tXmi7f^65Ylxj!we@z&zoOjOm3ifH
zvK^#1?h~%Myy?!Rw`zIvlpK_I<I6;WohSs}-7?gj<w(|(s+Hm3Vu>GEG<#uW%BvfQ
za}siW_r|ZtrLoc1iaB_vppJ7lsd8MXbDZx8Qy;UABHl?}eF6z**QL7%lt+PqvQL5u
z%rh{(0>V2{H9dA-DNrk>*bG!myGxoK!SlS&M`av5J;<V_`BltIRRvORh*pkyH;2TV
z+kMBMj?&%eACdHu<M`kk1ETNkwF;(;foo&HHK|*=F_WsPxGpdQ`34a3Brvv6a;}`l
z(UbVf6C1LR>GfOsjmv9tLCc$+)eI~ou8FMB{-6npEY5pkNF*)17Ut9l8g*q3Vfu*S
zeO?Ihh7Utdi_w^Skf^uAjYDPW)EuJdOi|sL41o7BMT&l)+^l?uS(Q6SD2jo<hU#nd
z4YO6}sElTGxm>C{VQxizkq^U&EzkGp!{VukUI1pk$#49AcWZs3HgZdgHhJ)_po)3)
zcV#h^8?z298*dmP0h=evB;1d4+8>m7t?}UM3ziKTDO+#p3{dOYR`jclG?A0|o4lrK
z@>=?ImsSC@5j}IA5(Z1y*JzVV7$oD{6I0$|No{fc)Q3e~la#IUxi*Yhws71HU4sow
zR<Dof(@nYA7_-br!d}o@&17(c6sc%|MnSuL^L}a5#gFO_<?#%EP*7cYU&ur=-2Jj5
zwxWaUk=1osL7+QWgW!QQI=hZ~jSO!G2u>8Fa|QGrejA(q{e+;nkBnSf^89`rjvu>D
zl*jo(_a98u07Tr^cgk>q1aLiN6b7v8{4n2$4%mwP@ZJF#lBXVyuo%EFL$wi(O2Q(6
zsoVSQ<*u1o&r{UM$xz$(@=7D{{hZMOfnp)yHYk&#OR#$u^2IURe=KjC>pph{2GIVN
zTI3rS6<_}qtTn4)a`_$h$5O9yu-3}<&+KCZ5rmV?yRSZvB$cKcBH{;v-hOb`0$<dA
z!5WCk5gWccdcl8kB*{?*!_8_%w|5dXt^<gFKObeX&IN^*G8EuBxLeTT+MO5gXAZ_#
zY=2fp1Qq@AKs2e*Bq{W~(~NXG#m0ct=-LI>6O(KhJ4=Xld^8LDC}zB<N<bRI2YFvz
zX4mGk9!Rs@<xHR~<4ayH`u=$>Ci8}nfear0r}A8&KC4*+4oB;Iu-+1!laZ`g*9(33
zkvjaL<>e4`^IjnE1^zyo+}zX)x$BkF=1tnWp4fRUeC-e^O8ycr_>HlAUZzgmooL=j
z!SD#A=3BG=bgTKB$j=qcE;~0n-$_j58CA5b>rD+G4x_YMRssd}RWhgpv&4rD<=zJw
zKBU@_V#o4j4y08Ep1J{ko{d#I6d04uhUrdMl>WP|X@u#&b>AcSa2iXyZ7EvV`vkcp
z7+mBv2G~2XuyZ_@QeQ;w-jH3B4EK8kVLuRsy}73RO|HHQT1S<lht>mylnauzMk5Ac
zC4I8!uy=<pn2)q$dNAWJbdt(A48uMi&`m7s<1L~eBruADbw&*U(&(|ejq~Y)2ZC-8
zM9N2Oxn#6R9^JkN#p;(4y+^#>`LfGC_Bb0bq~aXUKoUGCYsOh((w9O27}s1$Ky=*?
zzFtrWO4JuCFW6uZ3j^Q`-Z-U|OgVYar<=vo|0F0>{8n7uEIoY}JWJar(JOJ?SNrQU
zj+E|eG6NjggOlE78?i(#p)58Ae)go;@mtSKup83$pgj>MpZE}LtvV~DeL4~O3Gq-P
zyfiDAr#rkdEB3ytJ6ClmuVb1>%_$e=x+a;eYurgfDAM5$wTE6q>HHU4J^QCFy1?i|
zcEVR;<)S|ll>wyvPl!<uszRY}$?Fn-0L9?o1x#A7UNagNI?n9}nv9V}Dc$Pi`z>$Q
ztc4m?B46fHu9$U%nLk+gZ7^+f*@wJdeq8oZVwSA(ehaqI{-UqE9W%xlMDVu@TO+wB
zR1|;EOWTL>-huuU4FNm83ka)d1N%Z^bs9)AM&7sb`UI=7ka$D;_t3geI$6Sz)ro*#
z5B&1MHWuNdA8JW0Uf}4Q@3EHb5i0wh7QetL@0A?dG?rhkE8#FRX?HAmIv?`FxboF%
zPF$LlDCnWbW)En7IN^cP=NhCc-3W-;POy&~<PqL?O6lhjYL9=ipYXJ2!Jsgd{!@Hh
z`HQLl`n%$1w+R=fUGrRe#LbEwQ0@t*B1=UgIMLDx166lEprIF)R&tRtD3}zB=eO!I
z5s-w{`lE+!CW+bCnM{~UDjls4Llfua?x9`g(L>&+E~%$t4MQg4BdJE2DtZChqb(C2
z*zsazi5pYMelM3DDC8HpGrKsOE+B5FAa@$pcV;#jmLj3Xf`Y|A#FI2(GBRrEV1$LO
zC6oh$nPv_Q{6x%l_QypYtk;(_vqxO$t9x*~^3pjMGarzmB)r9W4}(q~m`8n`zbq<V
zNS&%s9&Es71rIx|f??|dwGqGw|H`?c5wrFr|4KOlFfdAgi@SOL7I*&lDhNVG|68U<
z24$OLApYOgd;gWdz!U_zLtW-n01ygj_na}nof29D!h?=eP(byTFrn7-K!6_uG-zHQ
zAkO@^A%<o%VL{(7Fag+k{|V(61OY^R|KNl;A~a`#kmNsS0e*kOA$kV`^EdJOKUYCe
z)rbEPUM^6R{IB%v|H%Fml840q6QV(FmocH{i$H*`&OcN9A|C)w{~r`LK!ctxN&@x`
z{vXBp8!{8X+~OZ?GbjD`1|>F_sQ(?iAjrk`uagA&wj>I0u>T90{%Jgyfq(&5D5@(h
zbbXfulkva$zimMfy&KfQl^Ke$!US-3g9@(*1G3$qP98+iS63jk?5~x{^Dh<s3o)TI
zt3betFO;&71ZuP@0dVpE2Qya4q04_gQvv^I;|>XwZ4C$@fc&M@Q1CZI=+F!%R1ot2
z2MP%J=d_0ap=)bQfTHk!6g?ap`eB_3kQ()mMz6~NE@J<|hjmpz4)h=Vv>^)^N&5%q
zH)H_AnSUW8R3H-{+O>@db=U*~CUX9nL~}5qBpaAe{QUp_$s76qoXYuF|MdJ@K)`C@
zUlT7hY>Nr7Sn?OLLzPPYZ&$eOzcW|%*F+6vFZ;h8EdQE_EB~2-E6Dzi!35B*`Aeyw
z=sO&Ms$Wpp5h|#~U)VnK7qUUg)-a(2<CrM_o%DjBP3YN<Euel9`ZOW@Z(4JAfq>9y
jXveN1U}+jkHcgMOrik!&b-}>!{k@N|VPME+{=@zcxVX?Z

delta 12163
zcmY*<Wl$Vpw=`KSxVwemE{hW&cyM<KPH=Zw2=21DySvNc?(XgoB)A8@yt(&&Rqy;c
z-926N)Tx>}Q*)}b#-WEsp=*2*P&^IxpLk)QpqAmGpoGD3!nokhj|kv01ar`c`b!Rw
zFMlt9Y;PzM6tvfxd^tn6?JP@uv?*|ub@P%L)8TPDb@TuQ@q3W%zmgWvwigK(remiL
z1H15;?sDkcd<B>n99D!m;ahgIN+6q{K+HaeFHxAA<p@$c;wSDx{Mn%KkRyR&#MQdE
zf})a}H)AJtQ!>%tSf0EMg+Y%e5Oy>CU(&r8rlcQ(^Vdj-?~`<g_6j39HSWa=<C_`$
z?GsNoVZSr3>NnOoNIZ(~z#%hAKGN7Mp~?d@6fQ)zOFwxP;rEK_hqZ7W*l6gMOim$!
z;-~luEGE6gFJv9IlBPIKc~a^bkTd&s5v%!n<l_h`GGtC;`xtP9Q9;G7doIU9c}f<T
zg=v-OmpR%5X?wO>3HaLaPvzcm#d;V8EOPto`T6WL0m;(rP@;Q#X2CyZoalbU;@R@1
z<c~(Pr=0ef_S2GMS4Uk1X%8ZdEa=(6vPAq$K1j&P((SWkQuoPbRJfPrtL|CT=i?T1
z?4ZR3tT}~=6R9<6x`2L2XW6Sbly0E-<Jp^MnpuN)+eR7P)viZY<4v6f<hx)RYRK@I
z8jPxgxEgepLr{?<XA~-)Q6Pqf09d3DhyJ{WLvd&@F0<iicS8e2%5)=`t52}drR4S`
ztc+;+#;A`L!yFl6x?`i;bcxDL<ep4^Bh)4@Ww#qOrH><C29p1+63HEqlt5y+b!C&A
zY+2ckJY*SAF#QAa`qRCOem!sa)|xFtt@yyegfw5{qxTxq+%}VAG5uh*;t{yDGTI7$
zn66WgbvK206{FaOp>c$FOGg<lReP_<Fmfz+`tZqxSF|-FgWP7bsLAC_8R$G?gAacd
z6l})J=KP0q449kCNqH2!$hz{d2Q?CK%OT?#wdigM%ec@UsaR%5pe?N<@fdymi*f}q
zb3b|i1?tW{6x@SM3>pfZ#=}1=>v|%;FAxm6M>i`g=Y#+<_a}5h<JsqlpO6O|IE22+
zGIy9jBHBJuGRW2PeGJ&=c3uI=Xl^OFZeh)$9rwlX_-A9cV>?hcptuIOqe>0fq6?Uy
zl<HOUElGNjXn$E0vGnY+OdwmJH8(aZtM`JvW1CAQn#Ou&0uhs&?F7DIpnjV~@WG*;
zi6-fc2u3ebLC7p~Cz1<z#tWTnIA!<&0ZIC!p$nHM4FXFjo`5)ac$VYUJi%MTZ#0>Y
zBm}Si7_WuOyz={mVcuz&3nNCeBS&h+bwnqoYRa<bCdz5jWvHv&ywK{<2jbjfOw|aZ
z(w;-cRFy9hB1b4J(M48d6-HC^X+kSMe8j|Gyh7B;s&faf;zf`!oKBwDv((-p&QG5d
z2-4mGiZakJh)_@;KSKQ-08r|1YKr(^5>ye89i}k0K)oVvv&?{6kM@h9&Z%-@p|5xV
zn+2<!>@-Iy7n@I7FU+E~+X(BoCynRND4cIlpoFW*B=uR$vX>g5({J9REPn2r(}!&u
zzae*9Lqa56YsM5!S>usjJ;vhN_`$Nx&H9?)7hFtxxr%i6?pV)*kWSBuSbL;)<Pm9*
zDju>%xi9Ue8|r<~Yxe_mIL|`KV1OR8j}Ivvxa_2vu9+#nZ_`YYQ@rGrP$SNyW-B;1
zHqozn?I&xYB_)x*=(Xo3NY#F2QtW1W2@xDdb+tY=EpVJGaFyDVJN_;%gDeP{!8Z3f
z6||#Io4`$~%5@cMxRR;qo?p?<g(?F=j!1?gsK_j#ureB3>M)mA5kK#ffCCmdgwX`2
z7AaR6$vnK&G8KeLa)n<WW4=?%w<1rE#D}4z7rlt#d06feh+e%jgUQ{@&UB4@jpmS7
zQt&TpcFu2CrHNT(Pg{pWW6OqW4%H<;Nk1Fr>$cz<xwFAN#>}5R;ioDp6^?)oiV`wp
zDK~ocgUE%7`t`*X+-*hDHS;u#ML`Jop0PQ2Uuk00(>@d}zOZ)A41P^|E9F@p;yixp
zhvI3Gvclxu57~FaUTA$~!_3au$0*83FeWAcL!$9q)0s8GD+Ucm=_PwaM#+XBH<|qn
zi#1>+_f|$bDwl<8Q{w`L^|p}1t(gsP?xO$EV?9)cXx{U~lHpELu<0BK>c3x@{rs5S
zS5zn{cTy-Q@_*kC{Y6wzr51v_>XOS_3<vPH#ccztpF#JaF{|bePW%8SYik$)Tp%UK
zH!*|A>;f7K0}hHQh_J!XpsVOyRFT~JKtpXkheH|{D$mtNoiM4kSZcjlD!o|_y$xr(
zwgQ=1o?oEfjA?O$;d9k~7wx~-ou+)>ys{sA-SmA>y45{KV_Y6VoI=l6PxO<WIl<pG
z`t0x@<%GN+neMK|2kzFWeTQPU27VJf#*^XtZp8?7lRaM%zkNgbuKop75nTOP3kx#Z
zE{A)Yk4bz43aM{T{dt6X6JdHUBzzm~KlO#6fhvQm2_A{=UUh^vW4dnkeqW(kJ`T}a
zzR+O3pA9WtvB1577W%uMY7yQqf}T~-RQHG;(S)*wKxvOGLT^M{s+gUHv|H?#LZi`k
z<vS>x-jXOz#4wiVoT~WB7NJAf)np{Q`KCrGM$c@tYDJH7rCj~j`B>T9g~1A?YK$(H
z>Qgx*>_VtA-3bT2kk1UVS{B~|K3B4vHqr@0|K>7@`o1^{k}F!TD5wJN<BEzDty_+I
zs&J(^rqdB6LgYrX*5oWWOzY|7ia63|jik%zY%Go2$=&cp)++74Tu?srpQ(;YA=s{*
zMy{Nsv~#nO#892hbeb4_IVn)ym`ON|RYL!Cvi`JT;no}0K7+9)7puuV?Nn0ypgC3A
zQ}y<(r8&eJv{8Is@9H%k9n&niZo(nhsiIg<gQ3vsx=zwyY%!Ej`SaJLzt2nCvx0c<
zP&*7}6$~MH$@%H;jjb)5u#8nFzd8mrPnb?kBX3=T+9v)uVmmU0)qJ*MA3h5OIo^?b
z+m3IXa9dtyQX#23*3(i&d0{O%zLs&o%7cAK>hFXzP&+qaOj|olW|WL(&GOwq!bAXI
zDyyG1s^T<yFf;3RzXtrp5^abW2htx(Lev0Oy33;QTo0oKI^QT$&-M4mC;6~kbgFUN
z5=!+C<?Wpm)You0FEbF~sL1s<N=_0t6+3RG<nuOGv<_CRx9l~c-G(@6=Y`$-%%tRV
z;@=;GO4y@ZltxFN30#zIIkM)|blQ?(r(JCOQ<Wpub+eZUqTA)!ZHIp7@)78KYD{0V
zoTH;@^;#cMqsJ1;ASF`4QE|uv-}ldf|3ueytje{xR;-1^v}1`QX3Tt%LS^rH>RkhW
zW0)AH5|wb$NIo`o>d(Y5Wne0iEzlDd?aAH*HSj0861WUy?K_GmtZCq?_gy`Si(YV;
zq?5Z5)NRC)1h2~lsNAOjV<Qn4nLgeh27SPhT+n1=a}>N-Jwo(fFU^-wLK&AX&J2%c
z9Dh8lL(n@bl&%C7Tu$aG8lnviVfGgq@*h}lE#i>P2-KC<%AO|%q&zzeP1s74x~_+T
zV4NC?LRn5C2TCdh+9iC)X2w1ADPGbTVQV&b=GF^-iOgL5l5<@d(NuM)WZb2Xjx}3X
z>OY<{?HMV{BO!EczXQy<#uyN+`BIY9>zU`Ehus|j)qgcb>*^Y3@rvipg;91OB!tf0
zF>20es{i~x1DE+&(tGpkOa_%Fd4dH8^rKUZ9;sF>OqI>S%`s5zcMRq12!<plxsFf_
ztBrJY(9mTA;ie&ZR6TAHo5c<>H7tMf*W$I#u^zFoS;L(#q>Yz8?(jg?oi-I46~wrN
zo8YsCeSHY+4;|^T-99;l&Z$_vq;(cF%{m=ErWFb=Cf#0srdMJ?6RG4g3dBP%P^}6@
z5Kw!)*80xKfL>qu`k{QskIInu$Ij7}5>oXJUw#R)-GW8^eyp>Oqo#X9m0s@$8PCG0
zc#2uOZ~gK4>;@w_b@z3|#@hLazVRn?O9Y(zHc7}M4n5a^@LODIP4w{yWVy9c#hF1a
z(=!KAdClvbjD~%3UMfFwG##Tckb_LH+HK`-e4`1>5)*-1K>j$9O1%T8tbGno-pDG|
zrx1ZJ-)sN$PahYkG_-hUPvk@guZ#T{l`qPOos}vrW`cxk`D-MKjK%{+D!SaQ-9QR0
z=Aa*+271v*csv_e3X~XC5sh>EwP*<H_M8O{A}{TcCMXhT6GEQRxr6RcLDqp1T9G5i
z_S#nsLC;30Y_c{o;wwA3&ccQTQF^)aRPi&CPC2cXh6=7l`D{`6ofRHQveN6lLzj6}
z2srI@9{uqJB>{5hHu<ZXI>o_qGP+Xreuq7=#nXWG+WiXIBgA_5-!?%cjasZ<(uN5W
z=2Vcwf-~y(Azw!E(TF#eK%UK1F(Yd-kJmcM$vslS-;|~rGt(m*Q6%^BZM<xjT&EOx
zzfj`)_^2|c=Rt8>Y15!R?|bx&c-xfuC58FWbC9^uBn{he;DpnxE7A*aCg!Bgpj#Xv
zXypb3gruf_ZE9b2+$da)9nzz#WeKUHXNu9e4z$!nNw+a~`eb>q33A-lO!mplD8>&{
z)xoX*laUx}gOYE>U9`$wBoalW!hhE_A+93BJPZ!ZWH&(H)M?S#fM73QJ+rv&dvU_c
zeIXmw<309$5{2Lk?uwrcKuzn#zvW|%^gG{Uw$z;|(em8ByN0M~MDALCQQ)gAH#3e+
z*4emu4%B0p)gFbsgOECXUg?G=NaV*gXAJdvi%sWg8(ri3txHaCB(GkB7PvjkIMQTK
ztbnyEr_|1`h#5C-^QKV|ETcVx*LV_*>N0M717SM#U(H7T0KZm0XG+dO^rql{-Lp5>
zTyMcN-Zm7Fs^he3d+SVWE|;V|Io>3jJ(C_%@s?IEZw_K*f_^o276jfZqc~`Z1K;&M
z8%LBE%*{D)vV^+Ae^2-z>L4aDvWOP>qI_LfyFirINbd^qEJ%25?fFg4ow*7Wwiqos
zK(h6KN26caJTaL!&Bc!t=BWU_7De^cT-~I2Nf?DCw570B#l;~=?nLxF`HPKCOg@Kt
zw5C?}+BmvWg3f78)S_xxEMgRXmG92$j6N7iKfX7~JuNjfi~`($n2{mPM;GGmQ@iPC
zobRc82nRwc?M`0E-S*2~8gzJWRh>EbN-1sh-MzL_EAKEL5t+@#^sZBJ5??Y}qP7M~
zAb`Y?SNKtA)B6m~hGNapJcX<UyQV>R@jY`ab4}I<Py)hn7&{yDLtFu1(PLAsOWu<9
zDEIkiXQ{)K@{Wcn&pYfskqjk`jhnxkX$Fh2S~OC#5y>+-eu)1kqm=zGs5t<HiXLoI
zIta~E7QLq%h9Vh#2K;<;xNp{&z*B2aaW*7o=bV`AXblQ-d8xH9&&X5>j4jt5$4aaH
zX^bQbYS;ys%V|k`2`j$+{i(d+^9-=COk^sdPP%gUBqN+GAMs9SOim71^25@XAW^Q8
zrEd=V7J_Uy$LK9O!31R050(lp^Z0Xm{AF6c(oOLKcixCWeOn&RoQP|e*=DY(V*jUH
zIwF_N?1lRAN<)*>M1l*c^3zOWeU*j|QpLwdP<8GzoTa%T$_TP$Rj&Gqa;Z(}!pm<n
z#)}@uv-!5lv(Ai*h%}8P@Z%qM8a0!Aol@?_Mia$k;Xk$12fyk($m$*4lrH{c2<03E
z*XbY%F6_Wx254)L_<j@`&lKuy4M{N0_&&-|UJ;`3zB@BERfTGI!wJK#xw(@*5T2`5
z0V2-Z4JN4gh49R-xv^tmiRx*FZZf>&j4!NUU^6|uU6ex;kj@VoBfO%k?^CsFwtmn!
zFR5Bp!n%c<Ko${QE2qy2aYAV}t9jF^@J1j4G@I5q;HC!ynx}HEJVozD%OdWhe+3i%
zsjw)~@}B^!O+oN*lV9<&TO&Es4$n#~K+lxpX0wE4--YYZDuwGEP1WF-SjIa-WD@-s
zkyn3i60rtsBCqP$<%A{h>vso7w_TqGYojgdb&ck@J3v<hRjc=`o>S!xVvL}NI&`-r
zqoI+#QVLyTsa!$_HYYywkHb9VfD17OF>Y(IC|>zP^YKk3Xn19Sw|Mp$xkCPKpdCuV
z(2z?co&mHL!(Yyq;*mQtXPYb(;nlkwjr@;%7F(ar(+fKM=RSvqh0HSlNVj}?Ak6-4
zgxS1Hz%@ZRCN$pv#<Mwb?Vi%U)hAe;Ct%+C_Hhl^JNb_AN?B$xgY6q$Pw44DA{1q=
zRvym%T_oc`I<(#zLG2qA^PagP9jGj}jvr$3s0B$@QW|*GdOV_S8SLhR)<OPazU=}1
z8+hppO~%UlgOzJHH;b2pd4wv>O0<s{<&No)f_-8pH6Dky4gYbQ_@&%;M*0nnfM<Lr
zv(7Q%xnH&GW!U9)4>_+lXi>|Wz;e`}+`a`YwD#zP2Wq-8A40z9oE3<O2IY279ulm3
z>2Vu`ZaXO;P|AWGQBM)L=wnc@Az8M*_$)u()V%{8rhW#X84<1P<@%b(_l3k9OuK1d
zxvVeEJ@dL(!MSqI6(L`AA<Ha1LRVZRbzf*XqfQto7}&w-$%*~)@iwc;mg7fL(Hi#t
z*~ZLTpfDR>TpMnHmk0ZR0ZKkJ^w#*G?~1c+if8qxg(C~tV6hyAl#qAqu9cY4YhdrT
zhRMFxO%19Tss7p<r3ya(3b)h8<R3sljOeW4OBez?KCwW!Eqf3|+X|tFmi$cV>aHDh
z`iDS_4<f8EJvQ)`J9^kXgA6x}{)7xyZGW^jKbbq5DIAlqcX4^_3?k8J8T3|TJ@KiS
zF+SU(Iex0ujZDKQs0on0AG36oBPxF<efA0bGd=a3Z2+&^?G!nA!>5nN4k#bFa?s5U
z<jNaToBUExF(~s01LWz!H@8r@QhcOzZ&8|+H{ns?bSy<bmEo&`IJ4FP&mIs-cFa`A
zm3#`T3|+?=%5GyOK((G<U@;NWMwzOOxHLwRpNisJsqBB6FYR;(5PNCcZsP)WR&_fr
z_fN`x4{w`THR)H?w2`(cm!!b?`1yt+yt3MW{Lk+(^0p--=uKsMo|)RxJo<76vS;Bt
z#UW45xyohab~)l}{KErF_5$Wd8YN;lha=r|+RG&FnmSetAS>uTV*W4w7<ZR&5(|BJ
z_P^vZ4Hmm-*!Oq(hzN{Q#e%(sCnIxM*iE=3gMaxj5l1c#b4KcE**mz$x%y_{>hDY(
z(c3Ap)FKJ`uceY5toc_6^KN+~pP4(GF;ef=uQo$X1$>|Fg!RyVt?T3oTo&)@O-*)e
z+SA~@iMt72Bz)!F<#Q)0HxVd#&*f}wie9dMYj-D^?0)a65BkJI3Ikh>bOG)W<Ogji
z%qijzX4ktgFpzAEiFd-J)}a*aiDKp9Q-saH+!~o7Y?6!`Vz)&%WImI5^aW94Mp5f~
z?vR;!Pg$%Crudt#culTl9X$xzO<BCZ{<%WxMkFQpmQUFy65N}IjAqhSkk2?|3QbUP
ztZB+>DY)e{FeahLiflu2{jlyxxClZT!ihQQ6?9uKVrddbza*?27H81CSg4Rb=GTu>
zKe?iZyGg_gTzBC{3-l>aR(MQjMgw55T4OVpMd+Y(nTb<Zpa}{I;&$SwTxW8W<=b%G
zmkeJf?S(B(JXc+AUF&JIS}w0wI&Q^zcq>(Br!EE**{Jl^=<{qD3N6ej5QC-=vf0O7
zggrUbsOoq8MR8tA4S0mr9w$2~?(yS;cKL&?srK(@xP+q9*;{^5cIh$$8F8zSlPmg%
z9EoZ^e>nAlYKs{p_@VZb>lrRnNI1aUrnFN#mEA&>P;Lvi&iciVNh&lfy~Wh%<C1L3
zaN6IQV}z-~w}^jOeLUQcZwnf`j5RDcKcBeBtq~2rdN-b@R$~*jQw`RKz&Or+m~fm$
zjUpHwAvq3IZi0(4^Si=2AyI#Z`%|y1SDcdMwoEHwVJlH?FUp3zV!|R4cK0bVlS0fE
zv#uwlMpP?)(2!n8QJW`7UHgmpwG0wCAJYJ9dYO{l8d20*o80^}!61n3LrH2NkP|#X
zeJrUU$b6F_;lZNwjCjuNe2&$ykD&L>)jjk4GA*iS?pA@E?J+V6c^g$N%3Xb2ChmM*
zN@J>zBm>)wDx}|y%}rR=tc^_5&Vls7GZd_WwPkniuJcL~HrB62m1Sq+TAZRs9ev-L
zV}wCr`EUXjM_(-gDdPUu^3UIStg`?c3hFC3N|+rqa=8p3M?Up~5y9<^hA9yFh>83G
z0UcV+gOX)rnDJ_YD88h!N!-CgPjT(1OJz8cnvzsE?W*=t*+N-kr4HVCRik>jI>**K
zgd3PjiS_~X-FKwp_lDO+tNBy5(^R|1VFWxH=8WvyxWbWrG)G?n0kd2c2Swe?z7$Yd
zAKDj0zpaEA<BHMsT9W<xMdEN!8aO$%$4ff_Bc!mu_u3FaBL%L$G!a5Mq7(U^bE!&(
z_k7~ZtlYA!kl)g;fOg42K$mFN)(d>)$dY{Wpq{!`;hjoa;+-8&G~0yY8y<Rb@9Z^Y
z@90)Ix)ve$(lZoM@Sc{fus<NE{~37j`B51}UU8{H%5rlhHOn$}D6PNqcd0!ZQ=EvX
z@nRw9I<QV}p)TVTUZX=nZ0QYAmsq5O=<jHgW&hgaBUs)prh+J?Rll6L2+Hlu;RuS7
zazCAzEWS4U<Yv(QU98sY1IzuWnVc+PaY(nmU+l78VLv=&evNC<>syu>7n;p=O-lxn
zER2x?PE9d+C&i$|@n%g>(}>kq3fd-i%E4G_JX#BJM(CwKWqi0L&t{n5#(pcx{_Gvj
zafGn*gb0$^v3nUoU#)-SuQN!e_43aa+(kOL6Y*GOCT&yPiNNkmk*bUwlw%@hwp%=H
z)~r_AphdH~Y9Td8WUSO|a@Si}1tx*i7c2BsT1_@qN7WY0EA%0*yejewsjKRh92Mf}
z(pIt**f!eT95r94U-J$<nKGt*yb-|M#8#HGC`B`BZ26@PBh!Svo)+b~jSa^V7Kxl;
ziJifkRvg50geil(80yS&lVi+GX)6%?&k|fAK{sN>u;oCDnjZ<9>SXf$qB@{E)7+ZQ
zmQMYcAq`8ViTKL-Fwp@+JikmgLs~+1Jhn{zODa#FR%%IHuV0?jZXOlF=7hR9;lCEb
zhRrrK%MF#kpqDT8o^n!9{vHu-ULpQ@G{|#d{X#hVa*Cn{yerIY8R6Jc3eav35hW6p
zLl6au)*k;XZJHCURjv(d$rA)QWm)`Es{bj0vb_1xMt=B(k7Ar-*o<spV%EiqUN}Bo
zN_nngA_Le=jbTVgh`W$%CQI*47hL{~3Y-wkOQgBe3ChG-@vs>FhP04hZ)wv>KL7c5
z4V8Uf^Ke~D?^ciwt5){MJ_rFof$@04v`po;CGC!j8g-`{Gt0VR*<2iij%jRj-J+k(
zDq`k!B5i>2RhQ6mcCV<y8oT(Y=%FOCiBk4*q4A>`f!U?4JO>xzd_5PlaD$C)$OET}
z@#tVt6O1gyi&SI3HdS;LTjMhmLnAJdIU-15XAHY7-J)N8<0EI2d77OZBb;XDy5zwd
zA^%S*gjuQ7Foc&Q)6a&WQqpQ}5vHbq4HR<dQMB48V?kYQoVtqLW-XQ&af2a@j{L$7
zDjc>RK_t9;T(22G5X)~RAVGVQro+`)#?QBK5+#SgM$B5Dk7z&c%tVlMct)a!FeN%{
z#rvQ-D#fe0@8GNk@tQs$s0B<KjH+%>Y=1b}j_Q!Y@kC6Y4@}DgrKPggJl#@U{xV0&
zp{z>BvGL2JgVU`fic|c;d?^Wae*h<550geQx5t%t8_e0ZXkb3uvVty?V)3Z0!xBM&
zF~PwEaKleU^Va5~h%m=@YQz9%KqxT~*D~xgW^3MH*z+I4qt#Ag^<wY48uQr0nWDsy
zBD18}r{R=67%^u+c^@Tl#MmeZ0ujG|00-|j=F(2G9{-|GY5QO~u)B~3#nLW}b{cPm
z0{`Nt7)Dc3539U8p|OSRf=tp)+BCx^1$BYg0gXqKXC9Js<vzqScIzh@lP2M{ijd@A
z+kj11A!0^Z+yi}*K;9E?R7Y>DJDXR7h){RUo}wm(g&~j$TGC6>ynxd~#XC4t%^E-L
zYDbakRNf&${0`f&IHbJ_bi|u$01RauGG;|_X-=B%jNsrhJadk<fr}KfC+GLw=L;tX
z-lx117r6A&2xiC6;*6TU?Rak&71*y+>CqJ8PhdzO#bhd(ktFVNJ`6*mQ|y%?hX~d2
z#ygF<=2ussy2pfkP49{ku5ugoDdro~WZ0p|!0}MRSQAd;XSVW)g*QTmku}4(vhHGp
zROzW%C;C5$Z$+~dw<XeD#X=>wJOa71u+F*CTe&v$E{es{$=3_Zk11v9TFz0@cym<r
zHZ=3^TN+RBucC==*UUlHiOFQ8-X!0vuTi`OEQeV@!Y{~%uKA<fR}+flDx!hj6W0S&
zwBD+3Y+FBDrZOfz8rl0*c{6MkUE6l*9q>QOn~)wMitV(kZuSW&J=u0j9(Z|Fb3BxK
z3;kAp`rrw+n3GB>=@}Ox=b;i3q*_Lw+w1u;j-02-*{H}-BEBYUwrw9J#h#8^@hz)C
z7>H{P5+g<XWy6!uciux_(ROc9!sZ#M)A%HdTn>rhSH0N(Lr=Etl_Jkyfj-i)xBMA5
z(wh@O)i<^s+xOc+$kV5}a0)9%{W)aAv_*mA8pI4T!|rpl=h{)BgY42*eA&^7)52qf
z1)Wp@d@E;dLhJeMrC@}onb#jA_UGTQW>y0xK&$EkEm}+Y!YUCB-w@EPQBo)7uJac|
z{4o&HCep$r(BvH$Uy5OLBJpw4&V`R>n7vkx8Kv@^v>i#|P^AB0ArIs>kuL^}5t&FS
z0zYZ9!vgdcT}KXjBq(tGePk&x@D!E{mpPOeQ?xeWlrj@xZ}y&MRGCqvZRk|)?N^iU
zKqK_E<JXAGFnBtJ`dtW#AZE75mQjUEFrrZ5_1tUZXxFy665Q?n>OgRAqfD>b6R)Sr
z!O>GPeb*-imR|GQ;6Q(n6Kz_gcG%4Kon;~2k$I%)QadOGA1BIS!XZw(N#exsBJTcU
zWAt6UUFuJ2J&zxcl%wgk?N!&D=--1uAcja^nhC3p1nFc?`mV`#MV?Rus+!Gjad*rs
zs=g}2gFYS$MVC7C?^*9T*JM;Ghj$7LQdrnYLzp{o44R5dpU;$oY-$RN>rl7`BkOVs
zGKA<}n?`?M0*9Sy9~)?;za+kogOnbt>EEN?tFDC}vs0`Z%Y_rS4jxqB@Va6Ep!wQ2
zr4xa-=25axy!Sq`qVcurZz@j|QZDZ}WHBeF{%Rd%&2gy&+)mPw@3oJ+Sc!r~3aW1j
z)#^_mZ+^tnJ{qqgI!UdE9A$Yq8JK+O439IiExKx*N$D4`#ci@T!2B~+y*KfEyS(s+
zO%`0wC#w8dQ^E^XllypEn|cf@P-E9;rCXUoJw+|L4scI~t+3)X*NK_kc?h=bxfcq1
z9h%bMK<_1Bs622x?rhR|uvYiQyO2L2L(oVk`>VyBC$s8nj?DLB>zC0WExU4(M#o8<
zd<_}j1SZ#4NZs^L3LJy}<}@vB)E$_Q9n7w0gdY%5{eC9F&3OLc>Dw7J0R6&Xc3<z-
z57@Tai!V)#WuBSMNmaHo><-RoCMQ6+_*v>W0BmscZK&dfPpLf+XclONO^jZ?+HEf#
zv2J2z@(P>SFL!em_5eNK!YW<uG&+8MNUcpEmZsImuwc9L|7FuK2{=V6C99A6!*ojP
z+s2hm-uQ$NZA9|NErXww52VveM0#dk+W^Y!^^syU13YVwNvrB{7MZ2&`u8ZWsab^4
z(nA>s1;;r|;;{<M#4VbeU9Z)mJ<Xi%E=-ABkrPyR_ar%*8-7<?*0Q)dbZ5+9bqTxK
zOcdcCr6?f9L){p+N?c&Ios#Qe4KaLd6W{Ee5o9-k$<nby(xPor0!4A3ei}(Stv0<c
zTvYr7$xalxDlFwA$g@C!I&+Zh^zX+N&9Q35jS^Qn3brwo#OBfM(0meLj>g^rI!rrF
z6*O3qW5J@xlQQfBqoW{^kfj$-*Mb|8kTdQIb9#^O)cJx^aB7Q%%e}^k3BDRu@g5pQ
z7vw<Q$bgAaZfNimi0N+grJ+_5Z}?oJ3{Wo^97B&*z<dq}={S!i%FqO73TV(UfQm*W
z2SCEoBrj*leNt8EOA7_>4vB2F-J_9ewd%wu+Pc42D8PdbXs|OC&6Sp4kTV!6$HrPv
z@Q2nQUxkaTJh$>uY!`PKjDz(t7AY=2_z8U~Yfc?m>YV%rqM?92tg|ESh-13naL<94
z_`^Id4RkqoVQ}Yxc>d~RtBo(lkxZ1wIwq$7^cfBI_zPclN@q|r<1^R6un%mO)Bbhu
zujV;%br750Phb2WEQP=G{*Z1?!ozbvO9f>n=q-!CwPkz|Jt>t}ewgX*&GRY1#{ErU
zXE-8A*s!#^17dH;AC7SStPW?vLjq4gJ;O6PG-uLA3=HB@X!}`3S(hb7-IOI(#&{~V
z?`Y@@uNQ<7XD0L{CEQg~5&%~%1}td1{6H8Ol52Y5*B;<F`ehb{;l{|@pnFZc?-UVw
z)33OtqyX&5|D!)Y!Of10w^(FI#GX00f{G)pNcj3B36wE*zA@{_oL7EA_-#M;>DK4@
zL(8KD*B^9sM?)L(^8zyA`kCn)zBW=-EDPifKN^;e&;{EH2!hq6fZb`|k<oZeDw3nb
zMRE5iGohNsyi|U<p3{bC$h2rDyFwNJDIB2+=B4v=O6!I0!`;SjJoqnFy0pBmZVzh%
zBpg-9+Mwv_(*lFk-L%uOJ6H(3UD1hXDgXAw-Nf^uZ<=Bf$?!!^*aeZr*RKTZ9Rbnh
zD75SxrLO5QZf-(kihQ)+$9L<->mq~mYyy|%I8xF+M4{`tQ%4muaRl|Uss=_E<EHfG
zfNABeh705ppcd5mB34UCjE_F}CF|(ErXWo-v4WJjDsy<988##YmH2EHk$!MT22OXE
zt(~Cao3rw4NVy4T5nrwb;MiV%oKrZqO>x0+?SNO%zl}K7Uq#~HfET3NKY>ft$aTUV
zRXO$zA~guQ$B26Q8N4f;d*vNU&7k^5hjMlRM*SsgR6#`KE_Nx>(yOB9=tm9wySXtB
ze*qcNmpI`pofVh9lwRtOW0NPY`<3o?s#HO%#*25Sbvp{ld0~nb`h=PoJ$ED_8{Lku
z#`LG-#qr@g5Q>Rm_i`Yi!_ts*X^``AlQR#L)Y~A;!C5z44ld65UJe72<(&OU13xJI
zTx(-JEec_+);3FO4Pm2^Ad;;T#a2DuE&+*hAefz+CQ0T5*d*cA6vD`ek6@|lYpzQH
zN7tz^t$=PbjNSI?Hj~x^$~7fLlTrS>oGw}MX?%9wOo+)I7x}F}cRi+`A3H2caI_!0
z07Mr#A3|?-LTjLmtl25Eg5KOioj!|cAwucdis#@N)Bl+tm4!wR5$Xe*fWsR&=|RVA
z40|JBvF}NDw@wVwzv~@8gW!TwJq6_z3O2G$bDhNTCL|RTrINI2z_@ujnkXCQiJ>xR
zlXoqLo=zRDS?Lxc-I=GET1DT`Gi$)}yMB&-xTZ?yTr5VX6T6+vn<#J1eP?c8SNJU`
z6$PO`W}{iN^xQaxrZ`?9_veZQ13;rIx0C{~u%EQFXK<vNUuu*yG80{E1+G~o#CASA
zx=_&2mA3GdOwT=<ru@k0-bl=Xx&o@ZzQVp`6&{_bK*8N==LrR?Y+Lb<bTmg?{|a}M
zKPwnuXl;u~n)e_py5`fERDKjJ24ulQB`rA5O1Wz5M>imEX<QVT>NVt5MS$e1zz=2e
z+AC5E@!je@i{*x*cJP_X8i!s#uL07Ng#1Q;&NS4rQt>t{tm?{5Ib-Xl)2q<_u59`9
zoWH-|pGXlu-!bSlU=Vj@IcdXZG8>3337b1l7j;Zi;~BbORMtP2mvA8rpl|?e;43x|
zUP!uyA3xEO0+7jy*i+09@<6$`S2YN+Yk<&9_<3C@3O$%9UBH&E|55p|h2K3v8!j9K
z;jle13;qr%Nm2)DNt>8?YL2B6eSGLKV!1MPaJCvsp3GHSlx1e@s|-P=Z1r^YPP)w3
z7y3VN#!KDx)w6a?H9|>)-Nx$n`LyDsubHs-x+a55vj)|lva5++o<YijgLbVVGT5Ga
zxj2Zkh$MLq_*kD>fMMT47yS!d4bZK(a=5{q!oW?+B8h_^FBUgGs$0S+YT~?}@SJ8F
zBBT$bOIgm|N1D5xFf-qSJ-&Zf|K1qM)_WMMDq1Lfn}k#Uxh^KQKr$Rg>$*B=zv{*C
z<A~=?cm->EaFs=&)eLCaD8m&Ck?AXLOeTVuYrKy9sNTNA`O2Zl$4=N;ErHK+4ZAO#
znr|-grz<;(jAUzgM)gLJsRE&53RW^zP=Szem@w_P{lBw$!o)Luvlcrg`M&Q<MVnx0
z_g6<B`2g%^q?kY0vUU64B}cH{#jTm+8uBC34l2-Az6q*KrZRyXCj&3h&AJ(lhGd;-
z4#FG<t}z2VN#=hlx|c>wiVzdHbR6>0ZAwvxXZz^{V}7usu}Ms^+>nDlKej}njXAsM
z)aJ4Q3uoV9UkcRWNoNI%Zu&XHp*o-ZfqHViU2}M|Rv@Y&G@y8fH`^*Czh&7!eK5>G
zGl0BLBixc--wlDbZ|U59B-nDszHUXo={^&`wpkD%4cWFK|4IBNVsyq?Ge*gm_=eg^
zT0yGt4&%o1*gWgCEQ+}m-B9ahAo&7W6Mk>{3ZmMy<`V*3Lx0<C(#?&#=0#CD7VTdl
zr&pt$jcO<}+152<t(cY!)ZXdJR(4hAhFnO2HOc8!HZDOK#Z%JOaeR`C!jUm2;C)_4
zl0lfNCsBvX=duWC#qNa(m+vwG;W8E1l|F6{?NEm+!}65^N4aWob?K00d)k*D$Y?pA
z$~nT|%`#q}EM)fkCf&4>hKt{Oj2y3Hnnx+|KBdEtZ6!4XN^6A_aICt8I<`t4lMA{Z
z-V{vZXi|Za)Da`>dtW>eO{*IRe#ivo$ccQX6j$7qUL!yRt9chFERqYFO-jSr(|P7z
zfAe)Ut6YWQvSM_tT{EnGIL7r_PS@2<lGW5NFL2Vgp`o<XW~i>jd8D-ufF^s$GTsMI
zycMKs^zp^x`mh28Wpuqrcvr}zIyq>_cveiK(4r*t79XL|Ms8DaH9p|bxS8?V-5gv%
z1p6|(5z%&g<OdDRH$&LqOs~*$k8*G2kZzdwgPo3vLN|6y-p_W!c*N@8(f*TE12eA>
z*1M=5`NIB7I)e=tEMfmA<T$;61NevvjzcE_!z|Jf|5uRhZx-_Zt^$8Y^uHzwFv~JJ
z*n5!>P)P>P{R9M$Ez$!rKY`=OIl+ue^ne1Iza|{8&5{`42mL=dyd(_J;P?kWE%O3|
zIsZZXWisObZ2!FhP*4PLP*6<&ch28h;J+mB&(yt4PyGLvv40(({>zm0^`B{55FT75
z3<suNp$GV>{gW(KxB!fr;M^4x0GjsS@)=CG$_fZK{GXFoB>`z>|KQ}R7$DK&e<3`W
zb&Usb=?J!5QvfJBf!o*A0I5!3%yoXiuoGBeT@Rq*`nM2(zq?U_PuJ-IFkWDXT4FG8
zLl}_e{SU6MlYwhD2m#MN|LF4=GI(tT9Splk2>2QZCf`*3zySWVNeNEd6a!3!{uL;|
z2Vt1tkR^0*aU?qO|8-a3-x~oI-ueN+kNxMF+)@CH#Q%d^U}CWTHa*}r^&hR=76;s9
z{DY{uaA347+`o6x!J<2afXD3rm2ttNyXfGOztYG2e-dc{9{6pC9spbTk5=s>gSB>9
z0Ut{Kmr4LG%l<)vJ$`^#<v*xhMf&f_#e0MR-<rSO(SlF+=mE>U;ITehu+Tm|;9wMN
zwXX?4m;}F0egVJCqk}OH2mu>Y;OS}pf7Jait(gHQ9LRhCfVU5L;3Q}N)A0WTr*(JL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b4429748d..a4f0001d203 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95e..fbd7c515832 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d9607..5093609d512 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

From 94353b42240c3bd7fc49a67d16c04cecd0ddb07c Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 28 May 2020 16:26:30 +0300
Subject: [PATCH 440/444] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=B0=20delombok=20=D0=BF=D0=BE=D0=B4=20gradle=206.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bfa1c470716..7410ff5612b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -214,8 +214,13 @@ tasks.register("precommit") {
 }
 
 tasks {
-    val delombok by registering(io.franzbecker.gradle.lombok.task.DelombokTask::class) {
+    val delombok by registering(JavaExec::class) {
         dependsOn(compileJava)
+
+        main = project.extensions.findByType(io.franzbecker.gradle.lombok.LombokPluginExtension::class)!!.main
+        args = listOf("delombok")
+        classpath = project.configurations.getByName("compileClasspath")
+
         jvmArgs = listOf("-Dfile.encoding=UTF-8")
         val outputDir by extra { file("$buildDir/delombok") }
         outputs.dir(outputDir)

From 1060f8cc7ca4997c918d9b7a16fa5e8101e44233 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 30 May 2020 23:11:43 +0300
Subject: [PATCH 441/444] typo fix

---
 docs/diagnostics/ThisObjectAssign.md                            | 2 +-
 docs/diagnostics/index.md                                       | 2 +-
 .../diagnostics/ThisObjectAssignDiagnostic_ru.properties        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/diagnostics/ThisObjectAssign.md b/docs/diagnostics/ThisObjectAssign.md
index 98812324feb..14aa6eb06c5 100644
--- a/docs/diagnostics/ThisObjectAssign.md
+++ b/docs/diagnostics/ThisObjectAssign.md
@@ -1,4 +1,4 @@
-# Присвоение заначения свойству ЭтотОбъект (ThisObjectAssign)
+# Присвоение значения свойству ЭтотОбъект (ThisObjectAssign)
 
 | Тип | Поддерживаются<br/>языки | Важность | Включена<br/>по умолчанию | Время на<br/>исправление (мин) | Тэги |
 | :-: | :-: | :-: | :-: | :-: | :-: |
diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md
index 09c6b1a555e..226448a2cea 100644
--- a/docs/diagnostics/index.md
+++ b/docs/diagnostics/index.md
@@ -102,7 +102,7 @@
 | [SpaceAtStartComment](SpaceAtStartComment.md) | Пробел в начале комментария | Да | Информационный | Дефект кода | `standard` |
 | [TempFilesDir](TempFilesDir.md) | Вызов функции КаталогВременныхФайлов() | Да | Важный | Дефект кода | `standard`<br/>`badpractice` |
 | [TernaryOperatorUsage](TernaryOperatorUsage.md) | Использование тернарного оператора | Нет | Незначительный | Дефект кода | `brainoverload` |
-| [ThisObjectAssign](ThisObjectAssign.md) | Присвоение заначения свойству ЭтотОбъект | Да | Блокирующий | Ошибка | `error` |
+| [ThisObjectAssign](ThisObjectAssign.md) | Присвоение значения свойству ЭтотОбъект | Да | Блокирующий | Ошибка | `error` |
 | [TimeoutsInExternalResources](TimeoutsInExternalResources.md) | Таймауты при работе с внешними ресурсами | Да | Критичный | Ошибка | `unpredictable`<br/>`standard` |
 | [TooManyReturns](TooManyReturns.md) | Метод не должен содержать много возвратов | Нет | Незначительный | Дефект кода | `brainoverload` |
 | [TryNumber](TryNumber.md) | Приведение к числу в попытке | Да | Важный | Дефект кода | `standard` |
diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
index efac1ae6719..c2968335f86 100644
--- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
+++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/ThisObjectAssignDiagnostic_ru.properties
@@ -1,2 +1,2 @@
 diagnosticMessage=Свойство ЭтотОбъект доступно только для чтения
-diagnosticName=Присвоение заначения свойству ЭтотОбъект
+diagnosticName=Присвоение значения свойству ЭтотОбъект

From 3825e955805838527bb5243ef761253fa223de0e Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 30 May 2020 23:14:04 +0300
Subject: [PATCH 442/444] typo fix

---
 docs/diagnostics/EmptyRegion.md       | 7 ++-----
 docs/diagnostics/TempFilesDir.md      | 7 +------
 docs/diagnostics/UsingModalWindows.md | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/diagnostics/EmptyRegion.md b/docs/diagnostics/EmptyRegion.md
index 8897d8d65d5..8500d12afbb 100644
--- a/docs/diagnostics/EmptyRegion.md
+++ b/docs/diagnostics/EmptyRegion.md
@@ -17,11 +17,8 @@
 ```
 
 ## Источники
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
-Источник: [Стандарт: Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
+
+* Источник: [Стандарт: Структура модуля](https://its.1c.ru/db/v8std#content:455:hdoc)
 
 ## Сниппеты
 
diff --git a/docs/diagnostics/TempFilesDir.md b/docs/diagnostics/TempFilesDir.md
index bad41dcc8e7..fb2e2d2e99a 100644
--- a/docs/diagnostics/TempFilesDir.md
+++ b/docs/diagnostics/TempFilesDir.md
@@ -28,12 +28,7 @@
 Данные.Записать(ИмяПромежуточногоФайла);
 ```
 ## Источники
-<!-- Необходимо указывать ссылки на все источники, из которых почерпнута информация для создания диагностики -->
-<!-- Примеры источников
-* Источник: [Стандарт: Доступ к файловой системе из кода конфигурации](https://its.1c.ru/db/v8std#content:542:hdoc)
-* Источник: [Стандарт: Тексты модулей](https://its.1c.ru/db/v8std#content:456:hdoc)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
-* Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) -->
+
 * Источник: [Стандарт: Доступ к файловой системе из кода конфигурации](https://its.1c.ru/db/v8std#content:542:hdoc)
 
 ## Сниппеты
diff --git a/docs/diagnostics/UsingModalWindows.md b/docs/diagnostics/UsingModalWindows.md
index 5a55f7e351c..f1f7e3ac622 100644
--- a/docs/diagnostics/UsingModalWindows.md
+++ b/docs/diagnostics/UsingModalWindows.md
@@ -43,7 +43,7 @@
 ## Источники
 
 * [Ограничение на использование модальных окон и синхронных вызовов](https://its.1c.ru/db/v8std/content/703/hdoc/)
-* Полезная информаця: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
+* Полезная информация: [Отказ от использования модальных окон](https://its.1c.ru/db/metod8dev#content:5272:hdoc)
 
 ## Сниппеты
 

From c34ee197747f5c799b3acc127f25f498c400e2e8 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 30 May 2020 23:21:42 +0300
Subject: [PATCH 443/444] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/faq.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index bc1a31de1eb..2f23a8630d5 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -21,15 +21,17 @@
 - обратиться в чате [telegram](https://t.me/bsl_language_server) с ситуацией, возможно все-таки ошибки нет
 - создать ишью ([issue](https://github.com/1c-syntax/bsl-language-server/issues)) в репозитории проекта соответствующего типа, куда приложить описание ошибки и, очень желательно, примеры кода, где диагностика работает неверно.
 
-## `BSL Language Server` и SonarQube плагин это одно и тоже?
+## `BSL Language Server` и `SonarQube` плагин это одно и тоже?
 
-`BSL Language Server` является самостоятельным приложением, реализацией серверной части протокола LSP. Плагин для SonarQube использует `BSL Language Server` для выполнения анализа исходного кода языка BSL (конфигурации 1С, скрипты 1Scipt и OSWeb).
+`BSL Language Server` является самостоятельным приложением, реализацией серверной части протокола LSP. Плагин для `SonarQube` использует `BSL Language Server` для выполнения анализа исходного кода языка BSL (конфигурации 1С, скрипты 1Script и 1Script.Web).
 
 `BSL Language Server` может быть использован с любым приложением, имеющим реализацию LSP клиента. Проверенные подключения:
+
 * плагин для [VS code](https://github.com/1c-syntax/vsc-language-1c-bsl/);
 * дополнительная утилита для Конфигуратора [Phoenix BSL](https://github.com/otymko/phoenixbsl);
 * плагин для [Sublime Text](https://github.com/sublimelsp/LSP).
 
 Так же через прямой импорт `BSL Language Server` работают:
+
 * плагин для [1C:Enterprise development tools](https://github.com/DoublesunRUS/ru.capralow.dt.bslls.validator) (собственная реализация, без LSP);
 * плагин для [SonarQube](https://github.com/1c-syntax/sonar-bsl-plugin-community);

From 64990bc4ad6e5b5f101aa0e06e059af7f571669f Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 30 May 2020 23:24:36 +0300
Subject: [PATCH 444/444] Typo

---
 docs/systemRequirements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/systemRequirements.md b/docs/systemRequirements.md
index bf83c2fba34..c20e56ac85b 100644
--- a/docs/systemRequirements.md
+++ b/docs/systemRequirements.md
@@ -14,6 +14,6 @@
 
 `BSL Language Server` должен работать на всех системах под управлением современных десктопных и серверных операционных систем, для которых существует поддержка Java. В рамках сборочных конвейеров происходит тестирование наиболее популярных окружений:
 
-- гарантированно работает на последних версиях OS семейства Windows 7/10 включая серверные 2012 и выше
+- гарантированно работает на последних версиях OS семейства Windows 7/10, включая серверные 2012 и выше
 - поддерживаются OS на ядре Linux, в частности проводится тестирование каждого изменения на Ubuntu, в промышленной эксплуатации подтверждена работоспособность на CentOS версий 6 и 7.
 - поддерживается MacOS последних версий