Переход на EDT 2025.2

.github/workflows/build.yml

@@ -20,12 +20,12 @@ jobs:
       PR_REF: "${{ github.event_name == 'pull_request_target' && format('refs/pull/{0}/merge', github.event.pull_request.number) || '' }}"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       if: inputs.analyze
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
         ref: ${{ env.PR_REF }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       if: ${{ !inputs.analyze }}
 
     - name: Set up Maven 3.9.6
@@ -43,7 +43,7 @@ jobs:
         df -h
 
     - name: Cache maven repo
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
       with:
         path: ~/.m2/repository
@@ -52,7 +52,7 @@ jobs:
           ${{ runner.os }}-maven-latest-
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       if: inputs.analyze
       with:
         path: ~/.sonar/cache

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up JDK 11
       uses: actions/setup-java@v1
@@ -20,7 +20,7 @@ jobs:
         java-package: jdk+fx
 
     - name: Cache maven repo
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       if: github.event_name == 'push'
       with:
         path: ~/.m2/repository

bundles/com.e1c.ssl.bsl.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=117
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

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

@@ -16,7 +16,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Import-Package: com._1c.g5.modeling.xtext.scoping;version="[4.1.0,5.0.0)",
  com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)",
- com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
+ com._1c.g5.v8.dt.bsl.model;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.bsl.resource;version="[15.0.0,16.0.0)",
  com._1c.g5.v8.dt.bsl.ui.contentassist.stringliteral;version="[6.0.0,7.0.0)",
  com._1c.g5.v8.dt.bsl.validation.stringliterals;version="[5.0.0,6.0.0)",

bundles/com.e1c.ssl.bsl.ui/src/com/e1c/ssl/bsl/ui/AbstractStringLiteralProposalProviderCommonFunction.java

@@ -16,6 +16,7 @@
 import static com.e1c.ssl.bsl.AbstractCommonModuleCommonFunctionTypesComputer.COMMON_MODULE_NAME;
 import static com.e1c.ssl.bsl.AbstractCommonModuleCommonFunctionTypesComputer.COMMON_MODULE_NAME_RU;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -39,6 +40,7 @@
 import com._1c.g5.v8.dt.mcore.Property;
 import com._1c.g5.v8.dt.mcore.Type;
 import com._1c.g5.v8.dt.mcore.TypeItem;
+import com._1c.g5.v8.dt.mcore.TypeSet;
 import com._1c.g5.v8.dt.mcore.util.McoreUtil;
 import com._1c.g5.v8.dt.md.resource.MdTypeUtil;
 import com._1c.g5.v8.dt.platform.IEObjectTypeNames;
@@ -150,9 +152,20 @@ protected List<TypeItem> getReturnArrayRefTypes(Expression expr)
      */
     protected Collection<Property> getProperties(Collection<TypeItem> refTypes, String[] properties, EObject context)
     {
-
+        Collection<TypeItem> allTypes = new ArrayDeque<>();
+        for (TypeItem type : refTypes)
+        {
+            if (type instanceof TypeSet)
+            {
+                allTypes.addAll(((TypeSet)type).types(context));
+            }
+            else
+            {
+                allTypes.add(type);
+            }
+        }
         Collection<Pair<Collection<Property>, TypeItem>> all =
-            getDynamicFeatureAccessComputer().getAllProperties(refTypes, context.eResource());
+            getDynamicFeatureAccessComputer().getAllProperties(allTypes, context.eResource());
 
         if (properties.length > 1)
         {

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

@@ -17,12 +17,12 @@ Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",
- com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)",
- com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.0.0)",
+ com._1c.g5.v8.dt.bsl.model;version="[6.0.0,7.0.0)",
+ com._1c.g5.v8.dt.bsl.model.util;version="[5.0.0,6.0.0)",
  com._1c.g5.v8.dt.bsl.resource;version="[15.0.0,16.0.0)",
  com._1c.g5.v8.dt.bsl.typesystem;version="[10.0.0,11.0.0)",
  com._1c.g5.v8.dt.bsl.typesystem.util;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.core.platform;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.mcore.util;version="[3.0.0,4.0.0)",
  com._1c.g5.v8.dt.md.resource;version="[13.0.0,14.0.0)",

targets/default/default.target

@@ -13,13 +13,13 @@
 
 <!-- EDT -->
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.1/"/>
+<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.2/"/>
 <unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.0.0"/>
 </location>
 
 <!-- EDT -->
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.1/"/>
+<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.2/"/>
 <unit id="com._1c.g5.v8.dt.rcp" version="0.0.0"/>
 <unit id="com._1c.g5.v8.dt.feature.feature.group" version="0.0.0"/>
 <unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="0.0.0"/>
@@ -40,6 +40,12 @@
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
 </location>
 
+<!-- SVG -->
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.orbit.maven.org.apache.batik.feature.group" version="4.37.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0/"/>
+</location>
+
 <!-- Eclipse -->
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <repository id="eclipse_repository" location="https://download.eclipse.org/releases/2023-12/"/>