Обход NPE

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/CfgBuildingParseTreeVisitor.java

@@ -195,7 +195,7 @@ public ParseTree visitElsifBranch(BSLParser.ElsifBranchContext ctx) {
   public ParseTree visitCodeBlock(BSLParser.CodeBlockContext ctx) {
     var currentBlock = blocks.getCurrentBlock();
     graph.addVertex(currentBlock.begin());
-    return super.visitCodeBlock(ctx);
+    return ctx == null ? null : super.visitCodeBlock(ctx);
   }
 
   @Override
@@ -537,11 +537,7 @@ private void buildLoopSubgraph(@Nullable BSLParser.CodeBlockContext ctx, LoopVer
     jumpState.loopBreak = blocks.getCurrentBlock().end();
 
     blocks.enterBlock(jumpState);
-
-    if (ctx != null) {
-      ctx.accept(this);
-    }
-
+    visitCodeBlock(ctx);
     var body = blocks.leaveBlock();
 
     graph.addEdge(loopStart, body.begin(), CfgEdgeType.TRUE_BRANCH);

src/test/java/com/github/_1c_syntax/bsl/languageserver/cfg/ControlFlowGraphBuilderTest.java

@@ -288,6 +288,40 @@ void testInnerLoops() {
     assertThat(walker.getCurrentNode()).isInstanceOf(ExitVertex.class);
   }
 
+  @Test
+  void testLoopWithNullCodeBlock() {
+    var code = """
+      Для х = 1 По 10 Цикл
+      КонецЦикла;""";
+
+    var parseTree = parse(code);
+
+    // Force null code block by removing the CodeBlock child
+    var forStatement = parseTree.statement(0).compoundStatement().forStatement();
+    var children = forStatement.children;
+
+    // Find and remove the CodeBlockContext child
+    for (int i = 0; i < children.size(); i++) {
+      if (children.get(i) instanceof BSLParser.CodeBlockContext) {
+        children.remove(i);
+        break;
+      }
+    }
+
+    var builder = new CfgBuildingParseTreeVisitor();
+    var graph = builder.buildGraph(parseTree);
+
+    // Check if graph was built successfully
+    assertThat(graph).isNotNull();
+    assertThat(graph.vertexSet()).isNotEmpty();
+
+    // Verify basic structure - should at least have loop vertex and exit
+    var vertices = traverseToOrderedList(graph);
+    assertThat(vertices)
+      .hasAtLeastOneElementOfType(ForLoopVertex.class)
+      .hasAtLeastOneElementOfType(ExitVertex.class);
+  }
+
   @Test
   void tryHandlerFlowTest() {
     var code = """
@@ -451,41 +485,6 @@ void preprocessorIfWithElseBranching() {
     assertThat(walker.getCurrentNode()).isSameAs(lastStatement);
   }
 
-  @Test
-  void testLoopWithNullCodeBlock() {
-    var code = """
-      Для х = 1 По 10 Цикл
-        А = 1;
-      КонецЦикла;""";
-
-    var parseTree = parse(code);
-    
-    // Force null code block by removing the CodeBlock child
-    var forStatement = parseTree.statement(0).compoundStatement().forStatement();
-    var children = forStatement.children;
-    
-    // Find and remove the CodeBlockContext child
-    for (int i = 0; i < children.size(); i++) {
-      if (children.get(i) instanceof BSLParser.CodeBlockContext) {
-        children.remove(i);
-        break;
-      }
-    }
-
-    var builder = new CfgBuildingParseTreeVisitor();
-    var graph = builder.buildGraph(parseTree);
-
-    // Check if graph was built successfully
-    assertThat(graph).isNotNull();
-    assertThat(graph.vertexSet()).isNotEmpty();
-
-    // Verify basic structure - should at least have loop vertex and exit
-    var vertices = traverseToOrderedList(graph);
-    assertThat(vertices)
-      .hasAtLeastOneElementOfType(ForLoopVertex.class)
-      .hasAtLeastOneElementOfType(ExitVertex.class);
-  }
-
   @Test
   void preprocessorIfWithElseIfBranching() {
     var code = """