Обновление теста jmh

Author: nixel2007

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

@@ -27,46 +27,27 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.Optional;
-import java.util.Random;
 
 @State(Scope.Benchmark)
 public class VariableSymbolCreate {
 
-  private static final Random RANDOM = new Random();
-
   private Range range;
-  private Range variableNameRange;
 
-//  @Param("shortBased")
+  @Param({"false", "true"})
   boolean shortBased;
 
-  @Setup(Level.Invocation)
+  @Setup(Level.Trial)
   public void setup() {
-    var line = RANDOM.nextInt(60_000);
+    int line = shortBased ? 100 : 60_000;
     range = Ranges.create(line, 0, line, 1);
-
-    line = RANDOM.nextInt(60_000);
-    variableNameRange = Ranges.create(line, 0, line, 1);
-
-    var start = range.getStart();
-    var end = range.getEnd();
-    var variableNameRangeStart = variableNameRange.getStart();
-    var variableNameRangeEnd = variableNameRange.getEnd();
-
-    shortBased = start.getLine() <= Short.MAX_VALUE
-      && end.getLine() <= Short.MAX_VALUE
-      && start.getCharacter() <= Short.MAX_VALUE
-      && end.getCharacter() <= Short.MAX_VALUE
-      && variableNameRangeStart.getLine() <= Short.MAX_VALUE
-      && variableNameRangeStart.getCharacter() <= Short.MAX_VALUE
-      && variableNameRangeEnd.getCharacter() <= Short.MAX_VALUE;
   }
 
   @Benchmark
@@ -78,21 +59,12 @@ public void createVariableSymbols(Blackhole bh) {
     bh.consume(test);
   }
 
-  @Benchmark
-  @Fork(value = 2, warmups = 2)
-  @Warmup(time = 5, iterations = 3)
-  public void createVariableSymbolsInt(Blackhole bh) {
-    var test = getVariableSymbolBuilder().buildInt();
-
-    bh.consume(test);
-  }
-
   private VariableSymbolBuilder getVariableSymbolBuilder() {
     return VariableSymbol.builder()
       .name("test")
       .owner(null)
       .range(range)
-      .variableNameRange(variableNameRange)
+      .variableNameRange(range)
       .export(true)
       .kind(VariableKind.MODULE)
       .description(Optional.empty())

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

@@ -53,7 +53,7 @@ public VariableSymbolBuilder range(Range range) {
     startLine = start.getLine();
     startCharacter = start.getCharacter();
     endLine = end.getLine();
-    endCharacter =  end.getCharacter();
+    endCharacter = end.getCharacter();
 
     return this;
   }
@@ -110,32 +110,33 @@ public VariableSymbolBuilder description(Optional<VariableDescription> descripti
 
   public VariableSymbol build() {
 
-    if (startLine <= Short.MAX_VALUE
+    var shortBased = startLine <= Short.MAX_VALUE
       && endLine <= Short.MAX_VALUE
       && startCharacter <= Short.MAX_VALUE
       && endCharacter <= Short.MAX_VALUE
       && variableNameLine <= Short.MAX_VALUE
       && variableNameStartCharacter <= Short.MAX_VALUE
-      && variableNameEndCharacter <= Short.MAX_VALUE) {
-        return new ShortBasedVariableSymbol(
-          name,
-          scope,
-          owner,
-          (short) startLine,
-          (short) startCharacter,
-          (short) endLine,
-          (short) endCharacter,
-          (short) variableNameLine,
-          (short) variableNameStartCharacter,
-          (short) variableNameEndCharacter,
-          parent,
-          children,
-          (byte) kind.ordinal(),
-          export,
-          description
-        );
-      } else {
+      && variableNameEndCharacter <= Short.MAX_VALUE;
 
+    if (shortBased) {
+      return new ShortBasedVariableSymbol(
+        name,
+        scope,
+        owner,
+        (short) startLine,
+        (short) startCharacter,
+        (short) endLine,
+        (short) endCharacter,
+        (short) variableNameLine,
+        (short) variableNameStartCharacter,
+        (short) variableNameEndCharacter,
+        parent,
+        children,
+        (byte) kind.ordinal(),
+        export,
+        description
+      );
+    } else {
       return new IntBasedVariableSymbol(
         name,
         scope,