Merge pull request #3449 from 1c-syntax/autofix/fix-empty-parentheses

nixel2007 · web-flow · commit 2c84ffc221b2 · 2025-04-19T17:58:11.000+02:00
fix: handle empty parentheses in expression tree building
diff --git a/.github/workflows/sentry.yml b/.github/workflows/sentry.yml
@@ -25,12 +25,24 @@ jobs:
       - name: Get version from Gradle
         id: get_version
         run: echo "RELEASE_VERSION=$(./gradlew version -q)" >> $GITHUB_ENV
+      - name: Get Sentry environment from project version 
+        id: get_env
+        run: |
+          if [[ "${{ env.RELEASE_VERSION }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "ENVIRONMENT=production" >> $GITHUB_ENV
+          elif [[ "${{ env.RELEASE_VERSION }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-r[ca][0-9]+$ ]]; then
+            echo "ENVIRONMENT=pre-release" >> $GITHUB_ENV
+          elif [[ "${{ env.RELEASE_VERSION }}" == develop-* && ! "${{ env.RELEASE_VERSION }}" == *-DIRTY-* ]]; then
+            echo "ENVIRONMENT=develop" >> $GITHUB_ENV
+          else
+            echo "ENVIRONMENT=feature" >> $GITHUB_ENV
+          fi
       - name: Create Sentry release
         uses: getsentry/action-release@v3
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          environment: production
+          environment: ${{ env.ENVIRONMENT }}
           version: ${{ env.RELEASE_VERSION }}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/ParentProcessWatcher.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/ParentProcessWatcher.java
@@ -70,7 +70,8 @@ public void watch() {
       .orElse(false);
 
     if (!processIsAlive) {
-      LOGGER.info("Parent process with pid {} is not found. Closing application...", parentProcessId);
+      //noinspection StringConcatenationArgumentToLogCall - форматирование через {} не работает из-за NoClassDefException
+      LOGGER.info("Parent process with pid " + parentProcessId + " is not found. Closing application...");
       languageServer.exit();
     }
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java
@@ -28,6 +28,7 @@
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.lsp4j.ServerInfo;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -50,16 +51,13 @@ public class SentryScopeConfigurer {
   @Value("${sentry.dsn:}")
   private final String dsn;
 
-  @Value("${sentry.environment:dummy}")
-  private final String environment;
-
   @PostConstruct
   public void init() {
     if (dsn != null && !dsn.isEmpty()) {
       Sentry.init(options -> {
         options.setDsn(dsn);
-        options.setEnvironment(environment);
-        options.setRelease(serverInfo.getVersion());
+        options.setEnvironment(getEnvironment());
+        options.setRelease(getVersion());
         options.setAttachServerName(false);
         options.setServerName(getServerName());
         options.setBeforeSend(beforeSendCallback);
@@ -74,6 +72,26 @@ public void init() {
     });
   }
 
+  private String getEnvironment() {
+    String version = getVersion();
+    String environment;
+
+    if (version.matches("\\d+\\.\\d+\\.\\d+")) {
+      environment = "production";
+    } else if (version.matches("\\d+\\.\\d+\\.\\d+-r[ca]\\d+")) {
+      environment = "pre-release";
+    } else if (version.startsWith("develop-") && !version.contains("-DIRTY-")) {
+      environment = "develop";
+    } else {
+      environment = "feature";
+    }
+    return environment;
+  }
+
+  private String getVersion() {
+    return serverInfo.getVersion();
+  }
+
   @Nullable
   private String getServerName() {
     try {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/CfgBuildingParseTreeVisitor.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/CfgBuildingParseTreeVisitor.java
@@ -114,7 +114,9 @@ public ParseTree visitIfStatement(BSLParser.IfStatementContext ctx) {
 
     // тело true
     blocks.enterBlock();
-    ctx.ifBranch().codeBlock().accept(this);
+    if (ctx.ifBranch().codeBlock() != null) {
+      ctx.ifBranch().codeBlock().accept(this);
+    }
     var truePart = blocks.leaveBlock();
 
     graph.addEdge(conditionStatement, truePart.begin(), CfgEdgeType.TRUE_BRANCH);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ErrorExpressionNode.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ErrorExpressionNode.java
@@ -0,0 +1,44 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.utils.expressiontree;
+
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.Value;
+import lombok.experimental.NonFinal;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+@Value
+@NonFinal
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ErrorExpressionNode extends BslExpression {
+
+  protected ErrorExpressionNode() {
+    super(ExpressionNodeType.ERROR);
+  }
+
+  protected ErrorExpressionNode(ParseTree sourceCodeOperator) {
+    super(ExpressionNodeType.ERROR, sourceCodeOperator, null);
+  }
+
+}
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionNodeType.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionNodeType.java
@@ -28,5 +28,6 @@ public enum ExpressionNodeType {
   UNARY_OP,
   CALL,
   TERNARY_OP,
-  SKIPPED_CALL_ARG
+  SKIPPED_CALL_ARG,
+  ERROR
 }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeBuildingVisitor.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeBuildingVisitor.java
@@ -21,10 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.utils.expressiontree;
 
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserBaseVisitor;
-import lombok.Value;
+import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
@@ -40,11 +41,10 @@
  */
 public final class ExpressionTreeBuildingVisitor extends BSLParserBaseVisitor<ParseTree> {
 
-  @Value
-  private static class OperatorInCode {
-    BslOperator operator;
-    ParseTree actualSourceCode; // ИЛИ vs OR в диагностических сообщениях, как написано в коде
-
+  /**
+   * @param actualSourceCode ИЛИ vs OR в диагностических сообщениях, как написано в коде
+   */
+  private record OperatorInCode(BslOperator operator, ParseTree actualSourceCode) {
     public int getPriority() {
       return operator.getPriority();
     }
@@ -85,6 +85,16 @@ public ParseTree visitExpression(BSLParser.ExpressionContext ctx) {
     var nestingCount = operatorsInFly.size();
     recursionLevel++;
 
+    if (Trees.nodeContainsErrors(ctx) || (ctx.getChildCount() == 0 || ctx.children.stream().anyMatch(ErrorNode.class::isInstance))) {
+      var errorExpressionNode = new ErrorExpressionNode(ctx);
+      if (recursionLevel > 0) {
+        operands.push(errorExpressionNode);
+      } else {
+        resultExpression = errorExpressionNode;
+      }
+      return ctx;
+    }
+
     visitMember(ctx.member(0));
     var count = ctx.getChildCount();
 
@@ -110,6 +120,7 @@ public ParseTree visitExpression(BSLParser.ExpressionContext ctx) {
     }
 
     var operation = operands.peek();
+
     // В случае ошибок парсинга выражения, operation может быть null
     if (operation == null) {
       recursionLevel--;
@@ -132,7 +143,8 @@ public ParseTree visitExpression(BSLParser.ExpressionContext ctx) {
   public ParseTree visitMember(BSLParser.MemberContext ctx) {
 
     // В случае ошибки парсинга member может быть пустой.
-    if (ctx.getChildCount() == 0) {
+    if (Trees.nodeContainsErrors(ctx) || ctx.getChildCount() == 0 || ctx.children.stream().anyMatch(ErrorNode.class::isInstance)) {
+      operands.push(new ErrorExpressionNode(ctx));
       return ctx;
     }
 
@@ -146,26 +158,26 @@ public ParseTree visitMember(BSLParser.MemberContext ctx) {
 
     var unaryModifier = ctx.unaryModifier();
     var childIndex = 0;
+
     if (unaryModifier != null) {
       visitUnaryModifier(unaryModifier);
-      childIndex = 1;
+      childIndex = ctx.children.indexOf(unaryModifier) + 1;
     }
 
     if (ctx.waitExpression() != null) {
       return visitWaitExpression(ctx.waitExpression());
     }
 
     var dispatchChild = ctx.getChild(childIndex);
-    if (dispatchChild instanceof TerminalNode terminalNode) {
+    if (dispatchChild instanceof ErrorNode) {
+      operands.push(new ErrorExpressionNode(dispatchChild));
+    } else if (dispatchChild instanceof TerminalNode terminalNode) {
       var token = terminalNode.getSymbol().getType();
 
       // ручная диспетчеризация
       switch (token) {
-        case BSLLexer.LPAREN:
-          visitParenthesis(ctx.expression(), ctx.modifier());
-          break;
-        default:
-          throw new IllegalStateException("Unexpected rule " + dispatchChild);
+        case BSLLexer.LPAREN -> visitParenthesis(ctx.expression(), ctx.modifier());
+        default -> operands.push(new ErrorExpressionNode(dispatchChild));
       }
     } else {
       dispatchChild.accept(this);
@@ -177,7 +189,18 @@ public ParseTree visitMember(BSLParser.MemberContext ctx) {
   private void visitParenthesis(BSLParser.ExpressionContext expression,
                                 List<? extends BSLParser.ModifierContext> modifiers) {
 
+    // Handle the case where expression is empty (empty parentheses)
+    if (expression == null || expression.getTokens().isEmpty()) {
+      operands.push(new ErrorExpressionNode(expression));
+      return;
+    }
+
     var subExpr = makeSubexpression(expression);
+
+    if (subExpr == null) {
+      subExpr = new ErrorExpressionNode(expression);
+    }
+
     operands.push(subExpr);
 
     for (var modifier : modifiers) {
@@ -314,6 +337,11 @@ public ParseTree visitGlobalMethodCall(BSLParser.GlobalMethodCallContext ctx) {
 
   @Override
   public ParseTree visitNewExpression(BSLParser.NewExpressionContext ctx) {
+    if (Trees.nodeContainsErrors(ctx)) {
+      operands.push(new ErrorExpressionNode(ctx));
+      return ctx;
+    }
+
     var typeName = ctx.typeName();
 
     List<? extends BSLParser.CallParamContext> args;
@@ -327,6 +355,10 @@ public ParseTree visitNewExpression(BSLParser.NewExpressionContext ctx) {
     if (typeName == null) {
       // function style
       var typeNameArg = args.get(0);
+      if (typeNameArg.expression() == null) {
+        operands.push(new ErrorExpressionNode(ctx));
+        return ctx;
+      }
       args = args.stream().skip(1).toList();
       callNode = ConstructorCallNode.createDynamic(makeSubexpression(typeNameArg.expression()));
     } else {
@@ -407,18 +439,18 @@ private void buildOperation() {
     }
 
     var operator = operatorsInFly.pop();
-    if (Objects.requireNonNull(operator.getOperator()) == BslOperator.UNARY_MINUS
-      || operator.getOperator() == BslOperator.NOT
-      || operator.getOperator() == BslOperator.UNARY_PLUS) {
+    if (Objects.requireNonNull(operator.operator()) == BslOperator.UNARY_MINUS
+      || operator.operator() == BslOperator.NOT
+      || operator.operator() == BslOperator.UNARY_PLUS) {
 
       var operand = operands.pop();
-      var operation = UnaryOperationNode.create(operator.getOperator(), operand, operator.getActualSourceCode());
+      var operation = UnaryOperationNode.create(operator.operator(), operand, operator.actualSourceCode());
       operand.setParent(operation);
       operands.push(operation);
     } else {
       var right = operands.pop();
       var left = operands.pop();
-      var binaryOp = BinaryOperationNode.create(operator.getOperator(), left, right, operator.getActualSourceCode());
+      var binaryOp = BinaryOperationNode.create(operator.operator(), left, right, operator.actualSourceCode());
 
       left.setParent(binaryOp);
       right.setParent(binaryOp);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeVisitor.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeVisitor.java
@@ -28,22 +28,12 @@ public class ExpressionTreeVisitor {
 
   private void visit(BslExpression node) {
     switch (node.getNodeType()) {
-      case CALL:
-        visitAbstractCall((AbstractCallNode) node);
-        break;
-      case UNARY_OP:
-        visitUnaryOperation((UnaryOperationNode) node);
-        break;
-      case TERNARY_OP:
-        var ternary = (TernaryOperatorNode) node;
-        visitTernaryOperator(ternary);
-        break;
-      case BINARY_OP:
-        visitBinaryOperation((BinaryOperationNode)node);
-        break;
-
-      default:
-        break; // для спокойствия сонара
+      case CALL -> visitAbstractCall(node.cast());
+      case UNARY_OP -> visitUnaryOperation(node.cast());
+      case TERNARY_OP -> visitTernaryOperator(node.cast());
+      case BINARY_OP -> visitBinaryOperation(node.cast());
+      default -> { // для спокойствия сонара
+      }
     }
   }
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -19,6 +19,5 @@ logging.level.org.eclipse.lsp4j.jsonrpc.RemoteEndpoint=fatal
 
 app.websocket.lsp-path=/lsp
 sentry.dsn=https://03ebc809fae749d297327b8140d3cad0@o745542.ingest.sentry.io/5790531
-sentry.environment=production
 sentry.use-git-commit-id-as-release=false
 picocli.disable.closures=true
diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeBuildingVisitorTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ExpressionTreeBuildingVisitorTest.java
diff --git a/src/test/resources/application-websocket.properties b/src/test/resources/application-websocket.properties

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ public void watch() {`
`70`	`70`	`.orElse(false);`
`71`	`71`
`72`	`72`	`if (!processIsAlive) {`
`73`		`- LOGGER.info("Parent process with pid {} is not found. Closing application...", parentProcessId);`
	`73`	`+ //noinspection StringConcatenationArgumentToLogCall - форматирование через {} не работает из-за NoClassDefException`
	`74`	`+ LOGGER.info("Parent process with pid " + parentProcessId + " is not found. Closing application...");`
`74`	`75`	`languageServer.exit();`
`75`	`76`	`}`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ public enum ExpressionNodeType {`
`28`	`28`	`UNARY_OP,`
`29`	`29`	`CALL,`
`30`	`30`	`TERNARY_OP,`
`31`		`- SKIPPED_CALL_ARG`
	`31`	`+ SKIPPED_CALL_ARG,`
	`32`	`+ ERROR`
`32`	`33`	`}`