Инлайн Range внутрь частотных символов

Author: nixel2007

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

@@ -25,6 +25,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.Annotation;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.CompilerDirectiveKind;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.description.MethodDescription;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -52,9 +54,24 @@ public class MethodSymbol implements SourceDefinedSymbol, Exportable, Describabl
 
   @EqualsAndHashCode.Include
   DocumentContext owner;
-  Range range;
-  @EqualsAndHashCode.Include
-  Range subNameRange;
+
+  @Getter(AccessLevel.NONE)
+  int startLine;
+  @Getter(AccessLevel.NONE)
+  int startCharacter;
+  @Getter(AccessLevel.NONE)
+  int endLine;
+  @Getter(AccessLevel.NONE)
+  int endCharacter;
+
+  @Getter(AccessLevel.NONE)
+  int subNameStartLine;
+  @Getter(AccessLevel.NONE)
+  int subNameStartCharacter;
+  @Getter(AccessLevel.NONE)
+  int subNameEndLine;
+  @Getter(AccessLevel.NONE)
+  int subNameEndCharacter;
 
   @Getter
   @Setter
@@ -79,6 +96,16 @@ public class MethodSymbol implements SourceDefinedSymbol, Exportable, Describabl
   @Builder.Default
   List<Annotation> annotations = new ArrayList<>();
 
+  @Override
+  public Range getRange() {
+    return Ranges.create(startLine, startCharacter, endLine, endCharacter);
+  }
+
+  @EqualsAndHashCode.Include
+  public Range getSubNameRange() {
+    return Ranges.create(subNameStartLine, subNameStartCharacter, subNameEndLine, subNameEndCharacter);
+  }
+
   public Optional<RegionSymbol> getRegion() {
     return getParent()
       .filter(RegionSymbol.class::isInstance)
@@ -94,4 +121,33 @@ public void accept(SymbolTreeVisitor visitor) {
   public Range getSelectionRange() {
     return getSubNameRange();
   }
+
+  public static MethodSymbolBuilder builder() {
+    return new MethodSymbolBuilder();
+  }
+
+  public static class MethodSymbolBuilder {
+
+    public MethodSymbolBuilder range(Range range) {
+      var start = range.getStart();
+      var end = range.getEnd();
+      startLine = start.getLine();
+      startCharacter = start.getCharacter();
+      endLine = end.getLine();
+      endCharacter = end.getCharacter();
+
+      return this;
+    }
+
+    public MethodSymbolBuilder subNameRange(Range range) {
+      var start = range.getStart();
+      var end = range.getEnd();
+      subNameStartLine = start.getLine();
+      subNameStartCharacter = start.getCharacter();
+      subNameEndLine = end.getLine();
+      subNameEndCharacter = end.getCharacter();
+
+      return this;
+    }
+  }
 }

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

@@ -22,7 +22,10 @@
 package com.github._1c_syntax.bsl.languageserver.context.symbol;
 
 import com.github._1c_syntax.bsl.languageserver.context.symbol.description.ParameterDescription;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import lombok.AccessLevel;
 import lombok.Builder;
+import lombok.Getter;
 import lombok.Value;
 import org.eclipse.lsp4j.Range;
 
@@ -55,15 +58,30 @@ public class ParameterDefinition {
    */
   DefaultValue defaultValue;
 
+  @Getter(AccessLevel.NONE)
+  int startLine;
+  @Getter(AccessLevel.NONE)
+  int startCharacter;
+  @Getter(AccessLevel.NONE)
+  int endLine;
+  @Getter(AccessLevel.NONE)
+  int endCharacter;
+
   /**
    * Место объявления параметра.
    */
-  Range range;
+  public Range getRange() {
+    return Ranges.create(startLine, startCharacter, endLine, endCharacter);
+  }
 
   public boolean isOptional() {
     return !DefaultValue.EMPTY.equals(defaultValue);
   }
 
+  public static ParameterDefinitionBuilder builder() {
+    return new ParameterDefinitionBuilder();
+  }
+
   public enum ParameterType {
     DATETIME,
     BOOLEAN,
@@ -81,4 +99,18 @@ public static class DefaultValue {
     ParameterType type;
     String value;
   }
+
+  public static class ParameterDefinitionBuilder {
+
+    public ParameterDefinitionBuilder range(Range range) {
+      var start = range.getStart();
+      var end = range.getEnd();
+      startLine = start.getLine();
+      startCharacter = start.getCharacter();
+      endLine = end.getLine();
+      endCharacter = end.getCharacter();
+
+      return this;
+    }
+  }
 }

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

@@ -24,6 +24,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableDescription;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.variable.VariableKind;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -67,10 +69,23 @@ public class VariableSymbol implements SourceDefinedSymbol, Exportable, Describa
   @EqualsAndHashCode.Include
   DocumentContext owner;
 
-  Range range;
-
-  @EqualsAndHashCode.Include
-  Range variableNameRange;
+  @Getter(AccessLevel.NONE)
+  int startLine;
+  @Getter(AccessLevel.NONE)
+  int startCharacter;
+  @Getter(AccessLevel.NONE)
+  int endLine;
+  @Getter(AccessLevel.NONE)
+  int endCharacter;
+
+  @Getter(AccessLevel.NONE)
+  int variableNameStartLine;
+  @Getter(AccessLevel.NONE)
+  int variableNameStartCharacter;
+  @Getter(AccessLevel.NONE)
+  int variableNameEndLine;
+  @Getter(AccessLevel.NONE)
+  int variableNameEndCharacter;
 
   @Getter
   @Setter
@@ -96,6 +111,21 @@ public class VariableSymbol implements SourceDefinedSymbol, Exportable, Describa
    */
   Optional<VariableDescription> description;
 
+  @Override
+  public Range getRange() {
+    return Ranges.create(startLine, startCharacter, endLine, endCharacter);
+  }
+
+  @EqualsAndHashCode.Include
+  public Range getVariableNameRange() {
+    return Ranges.create(
+      variableNameStartLine,
+      variableNameStartCharacter,
+      variableNameEndLine,
+      variableNameEndCharacter
+    );
+  }
+
   @Override
   public void accept(SymbolTreeVisitor visitor) {
     visitor.visitVariable(this);
@@ -106,4 +136,33 @@ public Range getSelectionRange() {
     return getVariableNameRange();
   }
 
+  public static VariableSymbolBuilder builder() {
+    return new VariableSymbolBuilder();
+  }
+
+  public static class VariableSymbolBuilder {
+
+    public VariableSymbolBuilder range(Range range) {
+      var start = range.getStart();
+      var end = range.getEnd();
+      startLine = start.getLine();
+      startCharacter = start.getCharacter();
+      endLine = end.getLine();
+      endCharacter = end.getCharacter();
+
+      return this;
+    }
+
+    public VariableSymbolBuilder variableNameRange(Range range) {
+      var start = range.getStart();
+      var end = range.getEnd();
+      variableNameStartLine = start.getLine();
+      variableNameStartCharacter = start.getCharacter();
+      variableNameEndLine = end.getLine();
+      variableNameEndCharacter = end.getCharacter();
+
+      return this;
+    }
+  }
+
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/references/GenericInterner.java

@@ -0,0 +1,2 @@
+package com.github._1c_syntax.bsl.languageserver.references;public class GenericInterner {
+}