From 747479e1236548b0be8cf625642d32796fe4531c Mon Sep 17 00:00:00 2001 From: Maxim Dzyuba Date: Sun, 31 Aug 2025 18:23:49 +0300 Subject: [PATCH 1/6] Epic/G5V8DT-24236 version up --- bundles/com.e1c.ssl.bsl.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/com.e1c.ssl.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.ssl.bsl.ui/META-INF/MANIFEST.MF index 3494e11..a50e3e3 100644 --- a/bundles/com.e1c.ssl.bsl.ui/META-INF/MANIFEST.MF +++ b/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)", diff --git a/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF index 014ec05..f4c71c1 100644 --- a/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF @@ -17,8 +17,8 @@ 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)", From 1c69e43b59a4edb5661c5669e193dd5377ac7e7e Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Tue, 7 Oct 2025 23:35:38 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=20=D0=BD=D0=B0=20EDT=202025.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- targets/default/default.target | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/default/default.target b/targets/default/default.target index cc14306..b330336 100644 --- a/targets/default/default.target +++ b/targets/default/default.target @@ -13,13 +13,13 @@ - + - + From 852b280bdfc9b5869cf8318b74a143478d3a174b Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Tue, 7 Oct 2025 23:43:53 +0300 Subject: [PATCH 3/6] =?UTF-8?q?G5V8DT-26324=20=D0=9F=D0=BE=D0=B4=D1=8A?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF index 014ec05..5d5ab3e 100644 --- a/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.ssl.bsl/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.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)", From e18c7e4231328d3c4a6b215a4b8068b23f7daad7 Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Mon, 20 Oct 2025 16:55:05 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20org.apache.batik=20=D0=B2=20=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B3=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- targets/default/default.target | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/targets/default/default.target b/targets/default/default.target index b330336..a42de5c 100644 --- a/targets/default/default.target +++ b/targets/default/default.target @@ -40,6 +40,12 @@ + + + + + + From 3bf65e84e158e0adae7862df983382021b6a28df Mon Sep 17 00:00:00 2001 From: Maxim Dzyuba Date: Thu, 23 Oct 2025 15:26:03 +0300 Subject: [PATCH 5/6] =?UTF-8?q?G5V8DT-26947=20=D0=9C=D0=BD=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D1=8B=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D1=85=20=D0=BC=D0=BE=D0=B4=D1=83?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20#1772?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.settings/org.eclipse.jdt.core.prefs | 2 +- ...ngLiteralProposalProviderCommonFunction.java | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bundles/com.e1c.ssl.bsl.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/com.e1c.ssl.bsl.ui/.settings/org.eclipse.jdt.core.prefs index 517ec26..9154bef 100644 --- a/bundles/com.e1c.ssl.bsl.ui/.settings/org.eclipse.jdt.core.prefs +++ b/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 diff --git a/bundles/com.e1c.ssl.bsl.ui/src/com/e1c/ssl/bsl/ui/AbstractStringLiteralProposalProviderCommonFunction.java b/bundles/com.e1c.ssl.bsl.ui/src/com/e1c/ssl/bsl/ui/AbstractStringLiteralProposalProviderCommonFunction.java index 3223bb9..185076d 100644 --- a/bundles/com.e1c.ssl.bsl.ui/src/com/e1c/ssl/bsl/ui/AbstractStringLiteralProposalProviderCommonFunction.java +++ b/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 getReturnArrayRefTypes(Expression expr) */ protected Collection getProperties(Collection refTypes, String[] properties, EObject context) { - + Collection allTypes = new ArrayDeque<>(); + for (TypeItem type : refTypes) + { + if (type instanceof TypeSet) + { + allTypes.addAll(((TypeSet)type).types(context)); + } + else + { + allTypes.add(type); + } + } Collection, TypeItem>> all = - getDynamicFeatureAccessComputer().getAllProperties(refTypes, context.eResource()); + getDynamicFeatureAccessComputer().getAllProperties(allTypes, context.eResource()); if (properties.length > 1) { From 512ad178a59336251ce9c76442af757904a03aff Mon Sep 17 00:00:00 2001 From: Maxim Dzyuba Date: Wed, 29 Oct 2025 18:21:18 +0300 Subject: [PATCH 6/6] Fix build on github --- .github/workflows/build.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c711f6e..a55fcc4 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 251937d..b2d889c 100644 --- a/.github/workflows/release.yml +++ b/.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