Merge remote-tracking branch 'origin/develop' into feature/updateMDClasses_0_10

# Conflicts:
#	src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java

Author: theshadowco

build.gradle.kts

@@ -10,10 +10,10 @@ plugins {
     id("org.cadixdev.licenser") version "0.6.1"
     id("org.sonarqube") version "3.4.0.2513"
     id("io.freefair.lombok") version "6.5.0.2"
-    id("io.freefair.javadoc-links") version "6.5.0.2"
-    id("io.freefair.javadoc-utf-8") version "6.5.0.2"
-    id("io.freefair.aspectj.post-compile-weaving") version "6.5.0.2"
-    id("io.freefair.maven-central.validate-poms") version "6.5.0.2"
+    id("io.freefair.javadoc-links") version "6.5.0.3"
+    id("io.freefair.javadoc-utf-8") version "6.5.0.3"
+    id("io.freefair.aspectj.post-compile-weaving") version "6.5.0.3"
+    id("io.freefair.maven-central.validate-poms") version "6.5.0.3"
     id("me.qoomon.git-versioning") version "6.1.6"
     id("com.github.ben-manes.versions") version "0.42.0"
     id("org.springframework.boot") version "2.6.7"

src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java

@@ -27,10 +27,9 @@
 import com.github._1c_syntax.bsl.languageserver.context.FileType;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 import com.github._1c_syntax.bsl.languageserver.utils.Regions;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.types.ConfigurationSource;
-import com.github._1c_syntax.bsl.types.ModuleType;
-import com.github._1c_syntax.mdclasses.Configuration;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;
 import org.eclipse.lsp4j.CodeActionParams;
@@ -73,8 +72,8 @@ public GenerateStandardRegionsSupplier(LanguageServerConfiguration languageServe
   @Override
   public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext documentContext) {
 
-    ModuleType moduleType = documentContext.getModuleType();
-    FileType fileType = documentContext.getFileType();
+    var moduleType = documentContext.getModuleType();
+    var fileType = documentContext.getFileType();
 
     ScriptVariant regionsLanguage = getRegionsLanguage(documentContext, fileType);
     Set<String> neededStandardRegions;
@@ -100,14 +99,19 @@ public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext
     String result = neededStandardRegions.stream()
       .map(s -> String.format(regionFormat, s))
       .collect(Collectors.joining("\n"));
-    TextEdit textEdit = new TextEdit(calculateFixRange(params.getRange()), result);
+    var textEdit = new TextEdit(calculateFixRange(params.getRange()), result);
 
-    WorkspaceEdit edit = new WorkspaceEdit();
+    var edit = new WorkspaceEdit();
     Map<String, List<TextEdit>> changes = Map.of(documentContext.getUri().toString(),
       Collections.singletonList(textEdit));
     edit.setChanges(changes);
 
-    CodeAction codeAction = new CodeAction("Generate missing regions");
+    var title = Resources.getResourceString(
+      languageServerConfiguration.getLanguage(),
+      getClass(),
+      "title"
+    );
+    var codeAction = new CodeAction(title);
     codeAction.setDiagnostics(new ArrayList<>());
     codeAction.setKind(CodeActionKind.Refactor);
     codeAction.setEdit(edit);
@@ -117,7 +121,7 @@ public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext
   private ScriptVariant getRegionsLanguage(DocumentContext documentContext, FileType fileType) {
 
     ScriptVariant regionsLanguage;
-    Configuration configuration = documentContext.getServerContext().getConfiguration();
+    var configuration = documentContext.getServerContext().getConfiguration();
     if (configuration.getConfigurationSource() == ConfigurationSource.EMPTY || fileType == FileType.OS) {
       regionsLanguage = getScriptVariantFromConfigLanguage();
     } else {
@@ -137,7 +141,7 @@ private ScriptVariant getScriptVariantFromConfigLanguage() {
     return regionsLanguage;
   }
 
-  private Range calculateFixRange(Range range) {
+  private static Range calculateFixRange(Range range) {
 
     Position start = range.getStart();
     if (start == null) {

src/main/resources/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier_en.properties

@@ -0,0 +1 @@
+title=Generate missing regions

src/main/resources/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier_ru.properties

@@ -0,0 +1 @@
+title=Сгенерировать пропущенные области

src/test/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplierTest.java

@@ -21,7 +21,9 @@
  */
 package com.github._1c_syntax.bsl.languageserver.codeactions;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+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.util.CleanupContextBeforeClassAndAfterClass;
 import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionContext;
@@ -39,15 +41,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
+@CleanupContextBeforeClassAndAfterClass
 class GenerateStandardRegionsSupplierTest {
 
+  @Autowired
+  private LanguageServerConfiguration configuration;
+
   @Autowired
   private GenerateStandardRegionsSupplier codeActionSupplier;
 
   @Test
   void testGetCodeActions() {
 
     // given
+    configuration.setLanguage(Language.EN);
+
     String filePath = "./src/test/resources/suppliers/generateRegion.bsl";
     var documentContext = TestUtils.getDocumentContextFromFile(filePath);