Удаление типа переменной из хранимых данных

Author: nixel2007

src/jmh/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/VariableSymbolCreate.java

@@ -24,7 +24,6 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import org.eclipse.lsp4j.Range;
-import org.eclipse.lsp4j.SymbolKind;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
@@ -96,7 +95,6 @@ private VariableSymbolBuilder getVariableSymbolBuilder() {
       .variableNameRange(variableNameRange)
       .export(true)
       .kind(VariableKind.MODULE)
-      .symbolKind(SymbolKind.Variable)
       .description(Optional.empty())
       .scope(null);
   }

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

@@ -58,12 +58,6 @@ public class IntBasedVariableSymbol implements VariableSymbol {
    */
   SourceDefinedSymbol scope;
 
-  /**
-   * Тип символа. По умолчанию переменная.
-   */
-  @Builder.Default
-  byte symbolKind = (byte) SymbolKind.Variable.ordinal();
-
   /**
    * Файл в котором располагается переменная.
    */
@@ -111,7 +105,7 @@ public class IntBasedVariableSymbol implements VariableSymbol {
   Optional<VariableDescription> description;
 
   public SymbolKind getSymbolKind() {
-    return SymbolKind.values()[symbolKind];
+    return SymbolKind.Variable;
   }
 
   @Override

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

@@ -58,12 +58,6 @@ public class ShortBasedVariableSymbol implements VariableSymbol {
    */
   SourceDefinedSymbol scope;
 
-  /**
-   * Тип символа. По умолчанию переменная.
-   */
-  @Builder.Default
-  byte symbolKind = (byte) SymbolKind.Variable.ordinal();
-
   /**
    * Файл в котором располагается переменная.
    */
@@ -111,7 +105,7 @@ public class ShortBasedVariableSymbol implements VariableSymbol {
   Optional<VariableDescription> description;
 
   public SymbolKind getSymbolKind() {
-    return SymbolKind.values()[symbolKind];
+    return SymbolKind.Variable;
   }
 
   @Override

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

@@ -25,7 +25,6 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
 import org.eclipse.lsp4j.Range;
-import org.eclipse.lsp4j.SymbolKind;
 
 import java.util.Collections;
 import java.util.List;
@@ -42,7 +41,6 @@ public class VariableSymbolBuilder {
   private VariableKind kind;
   private String name;
   private SourceDefinedSymbol scope;
-  private SymbolKind symbolKind = SymbolKind.Variable;
   private DocumentContext owner;
   private Optional<SourceDefinedSymbol> parent = Optional.empty();
   private List<SourceDefinedSymbol> children = Collections.emptyList();
@@ -85,11 +83,6 @@ public VariableSymbolBuilder scope(SourceDefinedSymbol scope) {
     return this;
   }
 
-  public VariableSymbolBuilder symbolKind(SymbolKind symbolKind) {
-    this.symbolKind = symbolKind;
-    return this;
-  }
-
   public VariableSymbolBuilder owner(DocumentContext owner) {
     this.owner = owner;
     return this;
@@ -127,7 +120,6 @@ public VariableSymbol build() {
         return new ShortBasedVariableSymbol(
           name,
           scope,
-          (byte) symbolKind.ordinal(),
           owner,
           (short) startLine,
           (short) startCharacter,
@@ -147,7 +139,6 @@ public VariableSymbol build() {
       return new IntBasedVariableSymbol(
         name,
         scope,
-        (byte) symbolKind.ordinal(),
         owner,
         startLine,
         startCharacter,
@@ -169,7 +160,6 @@ public VariableSymbol buildInt() {
     return new IntBasedVariableSymbol(
       name,
       scope,
-      (byte) symbolKind.ordinal(),
       owner,
       startLine,
       startCharacter,