diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ac2c634..1cfd408f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
## 0.7.0
+Выпуск бета-версии для 1C:EDT 2023.3
### Новые проверки
@@ -20,6 +21,7 @@
- Проверка на уникальность имени поля в doc-comment-field-name #1392
- Проверка модификации ключей структуры вне функции-конструктора #1054
+- По умолчанию проверка "Код не должен следовать за асинхронным вызовом" (code-after-async-call) выключена. См. обсуждение в https://github.com/1C-Company/v8-code-style/pull/1408
#### Запросы
diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
index 6b3bcfc7..b437e3f3 100644
--- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
+++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
@@ -47,7 +47,7 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.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.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)",
- com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)",
+ com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)",
com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.bsl;version="[0.7.0,0.8.0)",
diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml b/bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml
index 16fe132e..cfc9ceba 100644
--- a/bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml
+++ b/bundles/com.e1c.v8codestyle.bsl.ui/plugin.xml
@@ -371,7 +371,7 @@
+ class="com.e1c.v8codestyle.internal.bsl.ui.ExecutableExtensionFactory:com.e1c.v8codestyle.internal.bsl.ui.services.BslModuleRegionsInfoService">
diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/OpenBslDocCommentViewFix.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/OpenBslDocCommentViewFix.java
index f64cedb0..97fc2cb8 100644
--- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/OpenBslDocCommentViewFix.java
+++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/bsl/ui/qfix/OpenBslDocCommentViewFix.java
@@ -81,9 +81,6 @@ public class OpenBslDocCommentViewFix
@Override
protected TextEdit fixIssue(XtextResource state, IXtextBslModuleFixModel model) throws BadLocationException
{
- IXtextInteractiveBslModuleFixModel interactiveModel = (IXtextInteractiveBslModuleFixModel)model;
-
- Integer offset = model.getIssue().getOffset() + 1;
Display display = PlatformUI.getWorkbench().getDisplay();
if (display.isDisposed())
{
@@ -101,13 +98,18 @@ public class OpenBslDocCommentViewFix
}
});
+ IXtextInteractiveBslModuleFixModel interactiveModel = (IXtextInteractiveBslModuleFixModel)model;
+ Integer offset = model.getIssue().getOffset() + 1;
ITextViewer viewer = BslQuickFixUtil.getTextViewer(interactiveModel.getModificationContext());
if (viewer != null && !display.isDisposed())
{
display.asyncExec(() -> {
- viewer.revealRange(offset, 1);
- viewer.getTextWidget().setFocus();
- viewer.setSelectedRange(offset, 1);
+ if (viewer.getDocument() != null)
+ {
+ viewer.revealRange(offset, 1);
+ viewer.getTextWidget().setFocus();
+ viewer.setSelectedRange(offset, 1);
+ }
});
}
return null;
diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java
index 91e89b48..94bc1ef3 100644
--- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java
+++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/services/BslModuleRegionsInfoService.java
@@ -41,7 +41,9 @@ import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
import com._1c.g5.v8.dt.form.model.FormPackage;
import com._1c.g5.v8.dt.mcore.NamedElement;
import com._1c.g5.v8.dt.metadata.mdclass.ScriptVariant;
+import com.e1c.v8codestyle.bsl.IModuleStructureProvider;
import com.e1c.v8codestyle.bsl.ModuleStructureSection;
+import com.google.inject.Inject;
/**
* Module regions related implementation of {@link IBslModuleTextInsertInfoService}
@@ -51,6 +53,9 @@ import com.e1c.v8codestyle.bsl.ModuleStructureSection;
public class BslModuleRegionsInfoService
implements IBslModuleTextInsertInfoService
{
+ @Inject
+ private IModuleStructureProvider moduleStructureProvider;
+
@Override
public IBslModuleTextInsertInfo getEventHandlerTextInsertInfo(IXtextDocument document, Module module,
int defaultPosition, IBslModuleEventData data)
@@ -77,7 +82,8 @@ public class BslModuleRegionsInfoService
getRegionOffsets(document, regionPreprocessors, declaredRegionName, scriptVariant);
int offset = getRegionOffset(regionOffsets, declaredRegionName, suffix, defaultPosition, scriptVariant);
String regionName = null;
- if (!isRegionExists(regionOffsets, declaredRegionName, suffix))
+ if (!isRegionExists(regionOffsets, declaredRegionName, suffix) && project.getProject() != null
+ && moduleStructureProvider.canCreateStructure(project.getProject()))
{
regionName = suffix.isEmpty() ? declaredRegionName : (declaredRegionName + suffix);
}
@@ -285,13 +291,17 @@ public class BslModuleRegionsInfoService
{
if (itemType.equals(EventItemType.TABLE))
{
- EObject container;
- while ((container = eventOwner.eContainer()) != null)
+ EObject container = eventOwner;
+ while (container != null)
{
if (container.eClass() == FormPackage.Literals.TABLE)
{
return ((NamedElement)container).getName();
}
+ else
+ {
+ container = container.eContainer();
+ }
}
}
return StringUtils.EMPTY;
diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
index 78658a42..ab248055 100644
--- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
+++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
@@ -51,7 +51,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
com.e1c.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)",
com.e1c.g5.v8.dt.check;version="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)",
- com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)",
+ com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)",
com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle;version="[0.7.0,0.8.0)",
diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/CodeAfterAsyncCallCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/CodeAfterAsyncCallCheck.java
index e198aca4..69826e09 100644
--- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/CodeAfterAsyncCallCheck.java
+++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/CodeAfterAsyncCallCheck.java
@@ -52,8 +52,6 @@ import com.e1c.g5.v8.dt.check.components.BasicCheck;
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
import com.e1c.g5.v8.dt.check.settings.IssueType;
import com.e1c.v8codestyle.bsl.IAsyncInvocationProvider;
-import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
-import com.e1c.v8codestyle.internal.bsl.BslPlugin;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
@@ -101,7 +99,7 @@ public final class CodeAfterAsyncCallCheck
.complexity(CheckComplexity.NORMAL)
.severity(IssueSeverity.MAJOR)
.issueType(IssueType.WARNING)
- .extension(new CommonSenseCheckExtension(getCheckId(), BslPlugin.PLUGIN_ID))
+ .disable()
.module()
.checkedObjectType(INVOCATION)
.parameter(PARAMETER_NAME, Boolean.class, DEFAULT_CHECK, Messages.CodeAfterAsyncCallCheck_Parameter);
diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ExportProcedureMissingCommentCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ExportProcedureMissingCommentCheck.java
index f7cfb7a2..96297bc0 100644
--- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ExportProcedureMissingCommentCheck.java
+++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ExportProcedureMissingCommentCheck.java
@@ -86,7 +86,7 @@ public class ExportProcedureMissingCommentCheck
private static boolean verifyTopRegion(Optional regionTop)
{
- if (regionTop.isEmpty())
+ if (regionTop.isEmpty() || regionTop.get().getName() == null)
{
return false;
}
diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ModuleStructureTopRegionCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ModuleStructureTopRegionCheck.java
index a6053573..027d3213 100644
--- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ModuleStructureTopRegionCheck.java
+++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ModuleStructureTopRegionCheck.java
@@ -275,6 +275,10 @@ public class ModuleStructureTopRegionCheck
for (RegionPreprocessor region : allRegions)
{
String regionName = region.getName();
+ if (StringUtils.isBlank(regionName))
+ {
+ continue;
+ }
countRegions.putIfAbsent(regionName, new ArrayList<>());
countRegions.get(regionName).add(region);
if (getFirstParentRegion(region).isEmpty())
@@ -288,7 +292,7 @@ public class ModuleStructureTopRegionCheck
{
for (String name : regionNames)
{
- if (regionName.equalsIgnoreCase(name))
+ if (regionName == null || regionName.equalsIgnoreCase(name))
{
return true;
}
diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java
index 1b5a5be8..382a6fcf 100644
--- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java
+++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java
@@ -207,7 +207,10 @@ public class TypedValueAddingToUntypedCollectionCheck
}
else
{
- actualTypes.addAll(((Type)type).getCollectionElementTypes().allTypes());
+ if (((Type)type).getCollectionElementTypes() != null)
+ {
+ actualTypes.addAll(((Type)type).getCollectionElementTypes().allTypes());
+ }
}
}
diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
index 8c50f5da..cb45f744 100644
--- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
+++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.context;version="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.ext;version="[1.0.0,2.0.0)",
- com.e1c.g5.v8.dt.check.qfix;version="[2.0.0,3.0.0)",
+ com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)",
com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)",
diff --git a/bundles/com.e1c.v8codestyle.right/src/com/e1c/v8codestyle/right/check/RoleRightSetCheck.java b/bundles/com.e1c.v8codestyle.right/src/com/e1c/v8codestyle/right/check/RoleRightSetCheck.java
index f6d588aa..831d678f 100644
--- a/bundles/com.e1c.v8codestyle.right/src/com/e1c/v8codestyle/right/check/RoleRightSetCheck.java
+++ b/bundles/com.e1c.v8codestyle.right/src/com/e1c/v8codestyle/right/check/RoleRightSetCheck.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.resource.IEObjectDescription;
import com._1c.g5.v8.bm.core.BmUriUtil;
@@ -319,17 +320,27 @@ public abstract class RoleRightSetCheck
private String getMdObjectName(MdObject mdObject, IV8Project project)
{
- if (mdObject == null)
+ if (mdObject == null || project == null)
{
return "Unknown"; //$NON-NLS-1$
}
- if (project != null && project.getScriptVariant() == ScriptVariant.RUSSIAN)
+ if (project.getScriptVariant() == ScriptVariant.RUSSIAN)
{
- return MdUtil.getFullyQualifiedNameRu(mdObject).toString();
+ QualifiedName fqn = MdUtil.getFullyQualifiedNameRu(mdObject);
+ if (fqn != null)
+ {
+ return fqn.toString();
+ }
}
- return MdUtil.getFullyQualifiedName(mdObject).toString();
+ QualifiedName fqn = MdUtil.getFullyQualifiedName(mdObject);
+ if (fqn != null)
+ {
+ return fqn.toString();
+ }
+
+ return "Unknown"; //$NON-NLS-1$
}
private Collection getDefaultObjectsWithRight(RoleDescription description, IProgressMonitor monitor)
diff --git a/targets/default/default.target b/targets/default/default.target
index 8072d877..cc99fca3 100644
--- a/targets/default/default.target
+++ b/targets/default/default.target
@@ -13,7 +13,7 @@
-
+
diff --git a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF
index bbdbebe4..171cc967 100644
--- a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF
+++ b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF
@@ -13,8 +13,6 @@ Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)",
com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.0.0)",
com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
- com._1c.g5.v8.dt.ui.util;version="[7.0.0,8.0.0)",
- com._1c.g5.v8.dt.ui.validation;version="[5.0.0,6.0.0)",
- com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)",
org.junit;version="[4.13.0,5.0.0)"
diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java
index 7e4c2868..50f204ad 100644
--- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java
+++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java
@@ -18,6 +18,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.eclipse.core.runtime.Path;
+import org.junit.Ignore;
import org.junit.Test;
import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys;
@@ -68,6 +69,7 @@ public class RedundantExportMethodCheckTest
}
@Test
+ @Ignore
public void testCallNoPublic() throws Exception
{
List markers = getMarkers(MODULE_CALL_NO_PUBLIC_FILE_NAME);
diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java
index 924852c6..6a511c89 100644
--- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java
+++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/SelfReferenceCheckTest.java
@@ -72,10 +72,10 @@ public class SelfReferenceCheckTest
List markers = getMarkers(COMMON_MODULE_FILE_NAME);
assertEquals(4, markers.size());
- assertEquals("6", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
- assertEquals("6", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
- assertEquals("10", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
- assertEquals("10", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
+ assertEquals("6", markers.get(2).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
+ assertEquals("6", markers.get(3).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
+ assertEquals("10", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
+ assertEquals("10", markers.get(1).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
}
/**
@@ -150,6 +150,9 @@ public class SelfReferenceCheckTest
assertNotNull(chekcId);
return markers.stream()
.filter(marker -> chekcId.equals(getCheckIdFromMarker(marker, getProject())))
+ .sorted((marker1, marker2) -> marker1.getExtraInfo()
+ .get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)
+ .compareTo(marker2.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)))
.collect(Collectors.toList());
}
diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java
index 78528cdf..e9b5e0da 100644
--- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java
+++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/fix/itests/ConsecutiveEmptyLinesFixTest.java
@@ -16,14 +16,8 @@ import org.junit.Ignore;
import org.junit.Test;
import com._1c.g5.v8.bm.core.IBmObject;
-import com._1c.g5.v8.dt.core.naming.ISymbolicLinkLocalizer;
import com._1c.g5.v8.dt.core.platform.IDtProject;
-import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
-import com._1c.g5.v8.dt.md.naming.MdSymbolicLinkLocalizer;
import com._1c.g5.v8.dt.metadata.mdclass.CommonModule;
-import com._1c.g5.v8.dt.ui.util.OpenHelper;
-import com._1c.g5.v8.dt.ui.validation.BmMarkerWrapper;
-import com._1c.g5.v8.dt.validation.marker.IMarkerWrapper;
import com._1c.g5.v8.dt.validation.marker.Marker;
import com._1c.g5.wiring.ServiceAccess;
import com.e1c.g5.v8.dt.check.qfix.FixProcessHandle;
@@ -47,9 +41,6 @@ public class ConsecutiveEmptyLinesFixTest
private static final String DESCRIPTION = "Clear extra empty lines";
private static final String COMMON_MODULE_FILE_NAME = "/src/CommonModules/CommonModule/Module.bsl";
private IFixManager fixManager = ServiceAccess.get(IFixManager.class);
- private IV8ProjectManager projectManager = ServiceAccess.get(IV8ProjectManager.class);
- private ISymbolicLinkLocalizer symbolicLinkLocalizer = new MdSymbolicLinkLocalizer();
- private final OpenHelper openHelper = new OpenHelper();
//after fixing the problem in EDT - delete it
@Ignore
@@ -96,10 +87,7 @@ public class ConsecutiveEmptyLinesFixTest
*/
private void applyFix(Marker marker, IDtProject dtProject)
{
- IMarkerWrapper markerWrapper = new BmMarkerWrapper(marker, dtProject.getWorkspaceProject(), bmModelManager,
- projectManager, symbolicLinkLocalizer, openHelper);
-
- FixProcessHandle handle = fixManager.prepareFix(markerWrapper, dtProject);
+ FixProcessHandle handle = fixManager.prepareFix(marker, dtProject);
FixVariantDescriptor variantDescr = null;
diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF
index 49e00e53..fcdfa282 100644
--- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF
+++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF
@@ -16,9 +16,7 @@ Import-Package: com._1c.g5.v8.bm.integration;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.mdclass;version="[9.0.0,10.0.0)",
com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
- com._1c.g5.v8.dt.ui.util;version="[7.0.0,8.0.0)",
- com._1c.g5.v8.dt.ui.validation;version="[5.0.0,6.0.0)",
- com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)",
org.junit;version="[4.13.0,5.0.0)"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)"
diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java
index 56253936..a8aabfd9 100644
--- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java
+++ b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/fix/itests/FormFixTestBase.java
@@ -16,13 +16,7 @@ import java.util.Collection;
import org.eclipse.core.runtime.NullProgressMonitor;
-import com._1c.g5.v8.dt.core.naming.ISymbolicLinkLocalizer;
import com._1c.g5.v8.dt.core.platform.IDtProject;
-import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
-import com._1c.g5.v8.dt.form.naming.FormSymbolicLinkLocalizer;
-import com._1c.g5.v8.dt.ui.util.OpenHelper;
-import com._1c.g5.v8.dt.ui.validation.BmMarkerWrapper;
-import com._1c.g5.v8.dt.validation.marker.IMarkerWrapper;
import com._1c.g5.v8.dt.validation.marker.Marker;
import com._1c.g5.wiring.ServiceAccess;
import com.e1c.g5.v8.dt.check.qfix.FixProcessHandle;
@@ -41,9 +35,6 @@ public abstract class FormFixTestBase
private final String fixDescriptionPattern;
private IFixManager fixManager = ServiceAccess.get(IFixManager.class);
- private IV8ProjectManager projectManager = ServiceAccess.get(IV8ProjectManager.class);
- private ISymbolicLinkLocalizer symbolicLinkLocalizer = new FormSymbolicLinkLocalizer();
- private final OpenHelper openHelper = new OpenHelper();
/**
* Instantiates a new form fix test base.
@@ -64,10 +55,7 @@ public abstract class FormFixTestBase
*/
protected void applyFix(Marker marker, IDtProject dtProject)
{
- IMarkerWrapper markerWrapper = new BmMarkerWrapper(marker, dtProject.getWorkspaceProject(), bmModelManager,
- projectManager, symbolicLinkLocalizer, openHelper);
-
- FixProcessHandle handle = fixManager.prepareFix(markerWrapper, dtProject);
+ FixProcessHandle handle = fixManager.prepareFix(marker, dtProject);
FixVariantDescriptor variantDescr = null;
diff --git a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF
index 09859f74..3606648d 100644
--- a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF
+++ b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ 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.testing;version="[3.1.0,4.0.0)",
- com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)",
org.junit;version="[4.13.0,5.0.0)"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)"
diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF
index 0166d6b6..d9f95472 100644
--- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF
+++ b/tests/com.e1c.v8codestyle.ql.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="[11.0.0,12.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)",
- com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)",
org.junit;version="[4.13.0,5.0.0)"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.900,4.0.0)",
diff --git a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF
index a9e19c5f..cd0c3004 100644
--- a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF
+++ b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Import-Package: com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)",
com._1c.g5.v8.dt.refactoring.core;version="[4.0.0,5.0.0)",
com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
- com._1c.g5.v8.dt.validation.marker;version="[8.0.0,9.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)",
org.junit;version="[4.13.0,5.0.0)"