From 1d83e807a259da943b626bfbc8977bdfce33f6df Mon Sep 17 00:00:00 2001 From: Alexey Sosnoviy Date: Wed, 23 Jun 2021 13:25:33 +0300 Subject: [PATCH 1/3] =?UTF-8?q?fix=20Npe=20=D0=BF=D1=80=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D1=85=20=D1=80=D0=B0=D0=B7=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/clouds42/Utils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/clouds42/Utils.java b/src/main/java/com/clouds42/Utils.java index cb3cff0..5cb6f5f 100644 --- a/src/main/java/com/clouds42/Utils.java +++ b/src/main/java/com/clouds42/Utils.java @@ -3,10 +3,14 @@ import com.clouds42.CommandLineOptions.ConnectionOptions; import com.clouds42.CommandLineOptions.MetadataOptions; import com.clouds42.CommandLineOptions.OutputOptions; -import com.github._1c_syntax.bsl.parser.*; +import com.github._1c_syntax.bsl.parser.BSLLexer; +import com.github._1c_syntax.bsl.parser.BSLParser; +import com.github._1c_syntax.bsl.parser.BSLParserRuleContext; +import com.github._1c_syntax.bsl.parser.BSLTokenizer; +import com.github._1c_syntax.bsl.parser.Tokenizer; +import com.github._1c_syntax.mdclasses.Configuration; import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase; import com.github._1c_syntax.mdclasses.mdo.MDSettingsStorage; -import com.github._1c_syntax.mdclasses.Configuration; import com.github._1c_syntax.mdclasses.mdo.support.MDOModule; import com.github._1c_syntax.mdclasses.mdo.support.ModuleType; import com.github._1c_syntax.mdclasses.supportconf.SupportVariant; @@ -185,10 +189,10 @@ private static void addCoverageData(Map> coverageD private static boolean mustCovered(Tree node) { return (node instanceof BSLParser.StatementContext - && ((BSLParser.StatementContext) node).children.stream().noneMatch(parseTree -> + && Trees.getChildren(node).stream().noneMatch(parseTree -> parseTree instanceof BSLParser.PreprocessorContext || parseTree instanceof BSLParser.CompoundStatementContext - && ((BSLParser.CompoundStatementContext) parseTree).children.stream().anyMatch( + && Trees.getChildren(parseTree).stream().anyMatch( parseTree1 -> parseTree1 instanceof BSLParser.TryStatementContext))) || node instanceof BSLParser.GlobalMethodCallContext || node instanceof BSLParser.Var_nameContext; From c2319e59624025aaaf7abcbfffae24dd87fed9aa Mon Sep 17 00:00:00 2001 From: Alexey Sosnoviy Date: Wed, 23 Jun 2021 13:44:19 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20Tree?= =?UTF-8?q?=20=D0=BD=D0=B0=20Parse=20Tree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/clouds42/Utils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/clouds42/Utils.java b/src/main/java/com/clouds42/Utils.java index 5cb6f5f..5b29cc9 100644 --- a/src/main/java/com/clouds42/Utils.java +++ b/src/main/java/com/clouds42/Utils.java @@ -17,8 +17,8 @@ import de.vandermeer.asciitable.AsciiTable; import de.vandermeer.asciitable.CWC_LongestLine; import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.TerminalNodeImpl; -import org.antlr.v4.runtime.tree.Tree; import org.antlr.v4.runtime.tree.Trees; import org.apache.commons.lang3.Range; import org.slf4j.Logger; @@ -187,7 +187,7 @@ private static void addCoverageData(Map> coverageD coverageData.put(uri, coverMap); } - private static boolean mustCovered(Tree node) { + private static boolean mustCovered(ParseTree node) { return (node instanceof BSLParser.StatementContext && Trees.getChildren(node).stream().noneMatch(parseTree -> parseTree instanceof BSLParser.PreprocessorContext From a1b234f2a5df146970e8ba38d287cbabb464c558 Mon Sep 17 00:00:00 2001 From: Alexey Sosnoviy Date: Wed, 23 Jun 2021 13:46:41 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=9F?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=20=D0=B8=D0=B7=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=BA=20=D0=BF=D0=BE=D0=BA=D1=80=D1=8B=D1=82?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/clouds42/Utils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/clouds42/Utils.java b/src/main/java/com/clouds42/Utils.java index 5b29cc9..32c052a 100644 --- a/src/main/java/com/clouds42/Utils.java +++ b/src/main/java/com/clouds42/Utils.java @@ -194,8 +194,7 @@ private static boolean mustCovered(ParseTree node) { || parseTree instanceof BSLParser.CompoundStatementContext && Trees.getChildren(parseTree).stream().anyMatch( parseTree1 -> parseTree1 instanceof BSLParser.TryStatementContext))) - || node instanceof BSLParser.GlobalMethodCallContext - || node instanceof BSLParser.Var_nameContext; + || node instanceof BSLParser.GlobalMethodCallContext; } public static Map readMetadata(MetadataOptions metadataOptions,