Merge branch 'develop'

Author: nixel2007

src/main/java/org/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputer.java

@@ -318,15 +318,20 @@ private void flattenMember(List<Token> result, BSLParser.MemberContext member) {
       return;
     }
 
+    final List<Token> nestedTokens = flattenExpression(expression);
+    if (nestedTokens.isEmpty()) {
+      return;
+    }
+
     final BSLParser.UnaryModifierContext unaryModifier = member.unaryModifier();
 
     if (unaryModifier != null && unaryModifier.NOT_KEYWORD() != null) {
       final CommonToken splitter = new CommonToken(-1);
       result.add(splitter);
-      result.addAll(flattenExpression(expression));
+      result.addAll(nestedTokens);
       result.add(splitter);
     } else {
-      result.addAll(flattenExpression(expression));
+      result.addAll(nestedTokens);
     }
   }
 

src/test/java/org/github/_1c_syntax/bsl/languageserver/context/computer/CognitiveComplexityComputerTest.java

@@ -66,6 +66,6 @@ void compute() throws IOException {
 
     MethodSymbol example4 = documentContext.getMethods().get(3);
     Integer example4Complexity = methodsComplexity.get(example4);
-    assertThat(example4Complexity).isEqualTo(14);
+    assertThat(example4Complexity).isEqualTo(15);
   }
 }

src/test/resources/context/computer/CognitiveComplexityComputerTest.bsl

@@ -169,4 +169,6 @@
        (НЕ b ИЛИ НЕ c))   // +1
        Тогда
     КонецЕсли;
+
+    А = А И НЕ (Б) И В;       // +1
 КонецПроцедуры