1
0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-12-01 09:06:43 +02:00

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

This commit is contained in:
Nikita Kuznetsov
2024-06-07 15:40:08 +03:00
4 changed files with 17 additions and 3 deletions

View File

@@ -119,6 +119,20 @@ public class SortService
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,

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -82,7 +82,7 @@ public class TempTableHasIndex
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);