Merge branch 'edt-2024-1' into G5V8DT-24814

1C-Company · Jun 7, 2024 · 285a004 · 285a004
2 parents c13c4e9 + 543be97
commit 285a004
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/...s/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/SortService.java b/...s/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/SortService.java
@@ -119,6 +119,20 @@ public SortService(IDtProjectManager dtProjectManager, IBmModelManager modelMana
         this.configurationProvider = configurationProvider;
         this.workspaceOrchestrator = workspaceOrchestrator;
         this.modelEditingSupport = modelEditingSupport;
+        workspaceOrchestrator.addListener(event -> {
+            if (event.isProjectClosing())
+            {
+                IProject project = event.getProject().getWorkspaceProject();
+                if (project != null)
+                {
+                    SortJob job = jobs.remove(project);
+                    if (job != null)
+                    {
+                        job.cancel();
+                    }
+                }
+            }
+        });
     }
 
     @LifecycleParticipant(phase = LifecyclePhase.RESOURCE_LOADING,

diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
  com._1c.g5.v8.dt.metadata.dbview;version="[4.0.0,5.0.0)",
  com._1c.g5.v8.dt.metadata.mdclass;version="[9.0.0,10.0.0)",
  com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)",
- com._1c.g5.v8.dt.ql.model;version="[4.0.0,5.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)",
  com._1c.g5.v8.dt.ql.typesystem;version="[6.0.0,7.0.0)",
  com._1c.g5.wiring;version="[2.2.0,3.0.0)",

diff --git a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.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.ql.model;version="[4.0.0,5.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)",
  com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",

diff --git a/bundles/com.e1c.v8codestyle.ql/src/com/e1c/v8codestyle/ql/check/TempTableHasIndex.java b/bundles/com.e1c.v8codestyle.ql/src/com/e1c/v8codestyle/ql/check/TempTableHasIndex.java
@@ -82,7 +82,7 @@ protected void checkQlObject(EObject object, QueryOwner owner, IQlResultAcceptor
             return;
         }
 
-        if (selectQuery.getIndexes() == null || selectQuery.getIndexes().isEmpty())
+        if (selectQuery.getIndexSets().isEmpty())
         {
             AbstractQuerySchemaTable table = selectQuery.getPlacementTable();
             String excludeTableNamePattern = parameters.getString(PARAMETER_EXCLUDE_TABLE_NAME_PATTERN);