Merge remote-tracking branch 'origin/edt-2024-2' into G5V8DT-25913

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
       run: |
         Xvfb :5 -screen 0 1280x1024x8 -fbdir /tmp &
         export DISPLAY=:5
-        mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -X -B -V 1C
+        mvn clean verify -PSDK,find-bugs -Dtycho.localArtifacts=ignore -Dtycho.p2.httptransport.type=JavaUrl -B -V
 
     - name: Cache SonarCloud packages
       uses: actions/cache@v2

.github/workflows/ci-build.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build
     # This build will run on master,release/* push, local PR and PR from forks without label Analyze
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name  || !contains(github.event.pull_request.labels.*.name, 'Analyze')
-    uses: 1C-company/v8-code-style/.github/workflows/build.yml@edt-2024-2
+    uses: 1C-company/v8-code-style/.github/workflows/build.yml@master
     with:
       analyze: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name }}
     secrets:

.github/workflows/release.yml

@@ -42,19 +42,19 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
   
     - name: Upload repo
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: repo
         path: repositories/com.e1c.v8codestyle.repository/target/repository/
         
     - name: Upload SDK repo
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: sdk-repo
         path: repositories/com.e1c.v8codestyle.repository.sdk/target/repository/
     
     - name: Upload JaCoCo exec data
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: jacoco
@@ -63,7 +63,7 @@ jobs:
           ./**/target/site/jacoco*/
     
     - name: Upload test logs on failure
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: logs

bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF

@@ -20,7 +20,7 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.wiring;version="[2.2.0,3.0.0)",
  com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",
  com.e1c.v8codestyle.autosort;version="[0.7.0,0.8.0)",

bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF

@@ -27,7 +27,7 @@ Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com.e1c.g5.v8.dt.cli.api;version="[3.0.0,4.0.0)",
  com.e1c.g5.v8.dt.cli.api.components;version="[3.0.0,4.0.0)",
  com.e1c.v8codestyle;version="[0.7.0,0.8.0)",

bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF

@@ -42,7 +42,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0
  com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)",
  com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.theming.ui.util;version="[2.0.0,3.0.0)",
  com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)",
  com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)",

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/properties/ModuleStructurePropertyPage.java

@@ -195,7 +195,8 @@ public class ModuleStructurePropertyPage
             return;
         }
         ScriptVariant script = v8Project.getScriptVariant();
-        Supplier<InputStream> content = moduleStructureProvider.getModuleStructureTemplate(getProject(), type, script);
+        Supplier<InputStream> content =
+            moduleStructureProvider.getModuleStructureTemplate(getProject(), type, false, script);
         if (content == null)
         {
             return;

bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/wizard/ModuleStructureNewWizardRelatedModelsFactory.java

@@ -35,6 +35,8 @@ import com._1c.g5.v8.dt.common.PreferenceUtils;
 import com._1c.g5.v8.dt.common.StringUtils;
 import com._1c.g5.v8.dt.core.filesystem.IQualifiedNameFilePathConverter;
 import com._1c.g5.v8.dt.metadata.mdclass.AbstractForm;
+import com._1c.g5.v8.dt.metadata.mdclass.CommonModule;
+import com._1c.g5.v8.dt.metadata.mdclass.ReturnValuesReuse;
 import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant;
 import com._1c.g5.v8.dt.ui.wizards.IDtNewWizardContext;
 import com.e1c.v8codestyle.bsl.IModuleStructureProvider;
@@ -85,15 +87,22 @@ public class ModuleStructureNewWizardRelatedModelsFactory
             {
                 formToAddModule = (AbstractForm)model;
             }
-            else if (model instanceof Module)
+            else if (model instanceof Module module)
             {
                 formToAddModule = null;
-                Module module = (Module)model;
                 IFile bslFile = getModuleFile(module);
                 if (bslFile != null)
                 {
                     ModuleType type = BslUtil.computeModuleType(module, qualifiedNameFilePathConverter);
-                    createOrUpdateModule(bslFile, type, context);
+                    if (type == ModuleType.COMMON_MODULE && context.getModel() instanceof CommonModule commonModule)
+                    {
+                        createOrUpdateModule(bslFile, ModuleType.COMMON_MODULE,
+                            commonModule.getReturnValuesReuse() != ReturnValuesReuse.DONT_USE, context);
+                    }
+                    else
+                    {
+                        createOrUpdateModule(bslFile, type, false, context);
+                    }
                 }
             }
         }
@@ -103,7 +112,7 @@ public class ModuleStructureNewWizardRelatedModelsFactory
             IFile bslFile = getModuleFile(formToAddModule, project);
             if (bslFile != null)
             {
-                createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, context);
+                createOrUpdateModule(bslFile, ModuleType.FORM_MODULE, false, context);
 
                 EObject module = createBslProxyModule(bslFile);
                 createdModels.add(module);
@@ -111,11 +120,12 @@ public class ModuleStructureNewWizardRelatedModelsFactory
         }
     }
 
-    private void createOrUpdateModule(IFile bslFile, ModuleType type, IDtNewWizardContext<EObject> context)
+    private void createOrUpdateModule(IFile bslFile, ModuleType type, boolean reusableModule,
+        IDtNewWizardContext<EObject> context)
     {
         ScriptVariant script = context.getV8project().getScriptVariant();
         Supplier<InputStream> content =
-            moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, script);
+            moduleStructureProvider.getModuleStructureTemplate(bslFile.getProject(), type, reusableModule, script);
         if (content == null)
         {
             return;
@@ -178,5 +188,4 @@ public class ModuleStructureNewWizardRelatedModelsFactory
             UiPlugin.log(status);
         }
     }
-
 }

bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF

@@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)",
  com._1c.g5.wiring;version="[2.0.0,3.0.0)",

bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/IModuleStructureProvider.java

@@ -54,11 +54,13 @@ public interface IModuleStructureProvider
      *
      * @param project the project, cannot be {@code null}.
      * @param moduleType the module type, cannot be {@code null}.
+     * @param reusableModule module is reusable common module.
      * @param script the script, cannot be {@code null}.
      * @return the module structure template supplier of input stream, may return {@code null} if there is no template
      * for such module type and script variant.
      */
-    Supplier<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType, ScriptVariant script);
+    Supplier<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType, boolean reusableModule,
+        ScriptVariant script);
 
     /**
      * Gets the module structure top regions in order of as they should be in module.

bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/internal/bsl/ModuleStructureProvider.java

@@ -53,6 +53,8 @@ public class ModuleStructureProvider
 
     private static final String FOLDER_EN = "/templates/en/"; //$NON-NLS-1$
 
+    private static final String REUSABLE_SUFFIX = "_reusable"; //$NON-NLS-1$
+
     private static final IPath FOLDER_SETTINGS = new org.eclipse.core.runtime.Path(".settings/templates"); //$NON-NLS-1$
 
     @Override
@@ -68,9 +70,8 @@ public class ModuleStructureProvider
 
     @Override
     public Supplier<InputStream> getModuleStructureTemplate(IProject project, ModuleType moduleType,
-        ScriptVariant script)
+        boolean reusableModule, ScriptVariant script)
     {
-
         if (moduleType == null || script == null)
         {
             return null;
@@ -78,6 +79,10 @@ public class ModuleStructureProvider
 
         StringBuilder sb = new StringBuilder();
         sb.append(moduleType.getName().toLowerCase());
+        if (reusableModule)
+        {
+            sb.append(REUSABLE_SUFFIX);
+        }
         sb.append("."); //$NON-NLS-1$
         sb.append(BSL_FILE_EXTENSION);
 

bundles/com.e1c.v8codestyle.bsl/templates/en/common_module_reusable.bsl

@@ -0,0 +1,12 @@
+
+#Region Internal
+
+// Enter code here.
+
+#EndRegion
+
+#Region Private
+
+// Enter code here.
+
+#EndRegion

bundles/com.e1c.v8codestyle.bsl/templates/ru/common_module_reusable.bsl

@@ -0,0 +1,12 @@
+
+#Область СлужебныйПрограммныйИнтерфейс
+
+// Код процедур и функций
+
+#КонецОбласти
+
+#Область СлужебныеПроцедурыИФункции
+
+// Код процедур и функций
+
+#КонецОбласти

bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF

@@ -28,8 +28,8 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.form.service.datasourceinfo;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.metadata;version="[5.0.0,6.0.0)",
- com._1c.g5.v8.dt.metadata.dbview;version="[4.0.0,5.0.0)",
+ com._1c.g5.v8.dt.metadata.dbview;version="[5.0.0,6.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)",
  com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.ql.resource;version="[5.0.0,6.0.0)",

bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF

@@ -22,7 +22,7 @@ Bundle-Localization: plugin
 Import-Package: com._1c.g5.v8.dt.common;version="[6.4.0,7.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.md.ui.shared;version="[2.3.200,3.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)",
  com._1c.g5.wiring;version="[2.2.0,3.0.0)",

bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.mcore.util;version="[3.13.0,4.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.schedule.model;version="[2.0.0,3.0.0)",

bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.metadata.dbview;version="4.0.0",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.ql.typesystem;version="5.0.0",
  com._1c.g5.wiring;version="[2.2.0,3.0.0)",

bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF

@@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.md;version="[20.0.0,21.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.platform.version;version="[2.0.0,3.0.0)",
  com._1c.g5.v8.dt.rights;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.rights.model;version="[4.0.0,5.0.0)",

tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/ModuleStructurePropertyPageTest.java

@@ -69,8 +69,7 @@ public class ModuleStructurePropertyPageTest
 
     private static final String EDTOR_TITLE = "/" + PROJECT_NAME + "/" + SETTINGS_TEMPLATES_COMMON_MODULE_BSL;
 
-    private static final String PROPERTY_PAGE_ID =
+    private static final String PROPERTY_PAGE_ID = "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage";
-        "com.e1c.v8codestyle.bsl.ui.properties.moduleStructurePropertyPage";
 
     @Rule
     public TestingWorkspace testingWorkspace = new TestingWorkspace(true, false);
@@ -130,13 +129,14 @@ public class ModuleStructurePropertyPageTest
     {
 
         IModuleStructureProvider moduleStructureProvider = ServiceAccess.get(IModuleStructureProvider.class);
-        Supplier<InputStream> templateProvider = moduleStructureProvider.getModuleStructureTemplate(project,
+        Supplier<InputStream> templateProvider =
-            ModuleType.COMMON_MODULE, null);
+            moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false, null);
         assertNull(templateProvider);
-        templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, null, ScriptVariant.ENGLISH);
+        templateProvider =
+            moduleStructureProvider.getModuleStructureTemplate(project, null, false, ScriptVariant.ENGLISH);
         assertNull(templateProvider);
-        templateProvider = moduleStructureProvider.getModuleStructureTemplate(project,
+        templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false,
-            ModuleType.COMMON_MODULE, ScriptVariant.ENGLISH);
+            ScriptVariant.ENGLISH);
         assertNotNull(templateProvider);
 
         Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
@@ -167,7 +167,6 @@ public class ModuleStructurePropertyPageTest
         waitEventSetnd(dialog);
         assertTrue(buttonOpen.isEnabled());
 
-
         buttonOpen.notifyListeners(SWT.Selection, new Event());
         assertNull(dialog.getShell());
         waitEventSetnd();
@@ -199,7 +198,7 @@ public class ModuleStructurePropertyPageTest
             file.setContents(in, true, true, new NullProgressMonitor());
         }
 
-        templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE,
+        templateProvider = moduleStructureProvider.getModuleStructureTemplate(project, ModuleType.COMMON_MODULE, false,
             ScriptVariant.ENGLISH);
 
         try (InputStream template = templateProvider.get();

tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF

@@ -14,7 +14,7 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)",
  com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
- com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
+ com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
  com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)",
  com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)",

tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: fragment
 Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",
  com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
- com._1c.g5.v8.dt.dcs.util;version="[14.0.0,15.0.0)",
+ com._1c.g5.v8.dt.dcs.util;version="[15.0.0,16.0.0)",
  com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)",
  com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)",
  com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)",