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 d6de0f9f..3e967245 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -23,14 +23,14 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.documentation.comment;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.bsl.formatting;version="[3.0.0,4.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.7.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.owner;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.bsl.services;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.bsl.ui;version="[9.0.0,10.0.0)", - com._1c.g5.v8.dt.bsl.ui.contentassist;version="[9.0.0,10.0.0)", - com._1c.g5.v8.dt.bsl.ui.editor;version="[10.0.0,11.0.0)", - com._1c.g5.v8.dt.bsl.ui.event;version="[6.0.0,7.0.0)", + com._1c.g5.v8.dt.bsl.ui;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.bsl.ui.contentassist;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.bsl.ui.editor;version="[11.0.0,12.0.0)", + com._1c.g5.v8.dt.bsl.ui.event;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.ui.menu;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.ui.quickfix;version="[4.1.0,5.0.0)", com._1c.g5.v8.dt.bsl.util;version="[8.0.0,9.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 28f5f96b..5fb0c06f 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -24,9 +24,9 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.bsl.common;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.contextdef;version="[2.0.0,3.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.model.resource.owner;version="[2.0.0,3.0.0)", - com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.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.services;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.stringliteral.contenttypes;version="[1.2.0,2.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/VariableNameInvalidCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/VariableNameInvalidCheck.java index 378a49b1..ba1ec269 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/VariableNameInvalidCheck.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/VariableNameInvalidCheck.java @@ -82,6 +82,12 @@ protected void configureCheck(CheckConfigurer builder) protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor) { + Variable variable = (Variable)object; + //if name of variable is null therefore syntax error + if (variable.getName() == null) + { + return; + } int minLength = parameters.getInt(MIN_NAME_LENGTH_PARAM_NAME); if (minLength <= 0) @@ -89,7 +95,6 @@ protected void check(Object object, ResultAcceptor resultAceptor, ICheckParamete minLength = MIN_NAME_LENGTH_DEFAULT; } - Variable variable = (Variable)object; if (variable.eContainer() instanceof StaticFeatureAccess && isForStatementAccessVariable(variable)) { return; diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF index 4ec4d0a0..1127c0d3 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Fragment-Host: com.e1c.v8codestyle.bsl.ui;bundle-version="[0.7.0,0.8.0)" Automatic-Module-Name: com.e1c.v8codestyle.bsl.ui.itests Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment -Import-Package: com._1c.g5.v8.dt.bsl.ui.editor;version="[10.0.0,11.0.0)", +Import-Package: com._1c.g5.v8.dt.bsl.ui.editor;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.ui.util;version="[9.0.0,10.0.0)", org.junit;version="[4.13.0,5.0.0)"