Тип в VariableSymbol

Author: asosnoviy

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolComputer.java

@@ -146,16 +146,24 @@ public ParseTree visitParam(BSLParser.ParamContext ctx) {
   }
 
   @Override
-  public ParseTree visitLValue(BSLParser.LValueContext ctx) {
+  public ParseTree visitAssignment(BSLParser.AssignmentContext ctx) {
+
+    var lValue = ctx.lValue();
+
     if (
-      ctx.getChildCount() > 1
-      || currentMethodVariables.containsKey(ctx.getText())
-      || moduleVariables.containsKey(ctx.getText())
+      lValue.getChildCount() > 1
+        || currentMethodVariables.containsKey(lValue.getText())
+        || moduleVariables.containsKey(lValue.getText())
     ) {
-      return ctx;
+      return lValue;
     }
 
-    updateVariablesCache(ctx.IDENTIFIER(), createDescription(ctx));
+    var typeName = "";
+    var newCtx = Trees.getNextNode(ctx.expression(), ctx.expression(), BSLParser.RULE_newExpression);
+    if (newCtx instanceof BSLParser.NewExpressionContext) {
+      typeName = ((BSLParser.NewExpressionContext) newCtx).typeName().getText();
+    }
+    updateVariablesCache(lValue.IDENTIFIER(), createDescription(lValue), typeName);
     return ctx;
   }
 
@@ -239,7 +247,11 @@ private Optional<VariableDescription> createDescription(BSLParserRuleContext ctx
 
   }
 
-  private void updateVariablesCache(TerminalNode node, Optional<VariableDescription> description) {
+  private void updateVariablesCache(TerminalNode identifier, Optional<VariableDescription> description) {
+    updateVariablesCache(identifier, description, "");
+  }
+
+  private void updateVariablesCache(TerminalNode node, Optional<VariableDescription> description, String type) {
     var variable = VariableSymbol.builder()
       .name(node.getText().intern())
       .owner(documentContext)
@@ -249,6 +261,7 @@ private void updateVariablesCache(TerminalNode node, Optional<VariableDescriptio
       .kind(VariableKind.DYNAMIC)
       .scope(currentMethod)
       .description(description)
+      .type(type)
       .build();
     variables.add(variable);
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/VariableSymbol.java

@@ -96,6 +96,9 @@ public class VariableSymbol implements SourceDefinedSymbol, Exportable, Describa
    */
   Optional<VariableDescription> description;
 
+  @Builder.Default
+  String type = "";
+
   @Override
   public void accept(SymbolTreeVisitor visitor) {
     visitor.visitVariable(this);

src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/VariableSymbolTest.java

@@ -144,4 +144,13 @@ void testVariableKind() {
 
   }
 
+  @Test
+  void testVariableNewOS() {
+
+    documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/symbol/variableSymbolTest.os");
+    variableSymbols = documentContext.getSymbolTree().getVariables();
+
+    assertThat(variableSymbols.get(0).getType()).isEqualTo("МойКласс");
+  }
+
 }

src/test/resources/context/symbol/variableSymbolTest.os

@@ -0,0 +1,3 @@
+Процедура В()
+    А = Новый МойКласс();
+КонецПроцедуры