Indent snapshot source lines with 2 spaces and replace tabs with spaces

- Add 2-space prefix to all source lines in snapshot output, matching
  the convention used by scip-go snapshots for caret-based indicators
- Convert tab indentation to 2-space indentation in test input files:
  TabIndented.java, AnnotationParameters.java, LombokBuilder.java

Author: jupblb

scip-java/src/main/scala/com/sourcegraph/scip_java/ScipPrinters.scala

@@ -12,6 +12,12 @@ import moped.reporters.Position
 
 object ScipPrinters {
 
+  /**
+   * Indent prefix prepended to each source line so that caret-based indicators
+   * in snapshot comments can point at arbitrary columns.
+   */
+  val sourceIndent = "  "
+
   def printTextDocument(
       doc: Scip.Document,
       text: String,
@@ -55,7 +61,7 @@ object ScipPrinters {
       .linesWithSeparators
       .zipWithIndex
       .foreach { case (line, i) =>
-        out.append(line.replace("\t", "→"))
+        out.append(sourceIndent).append(line.replace("\t", "  "))
         val occurrences = occurrencesByLine
           .getOrElse(i, Nil)
           .toSeq
@@ -133,8 +139,8 @@ object ScipPrinters {
       else
         "reference"
     val indent =
-      if (pos.startColumn > comment.length)
-        " " * (pos.startColumn - comment.length)
+      if (pos.startColumn + sourceIndent.length > comment.length)
+        " " * (pos.startColumn + sourceIndent.length - comment.length)
       else
         ""
     val caretCharacter =

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java

@@ -187,7 +187,7 @@ private void processTypedDocument(
         // Add enclosing_range if it exists
         if (occ.hasEnclosingRange()) {
           Semanticdb.Range enclosingRange = occ.getEnclosingRange();
-          boolean isEnclosingSingleLine = 
+          boolean isEnclosingSingleLine =
               enclosingRange.getStartLine() == enclosingRange.getEndLine();
           Iterable<Integer> enclosingRangeInts =
               isEnclosingSingleLine

semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbBuilders.java

@@ -52,12 +52,12 @@ public static Semanticdb.Signature signature(Semanticdb.TypeSignature.Builder si
   // SemanticDB Symbols
 
   public static Semanticdb.SymbolOccurrence symbolOccurrence(
-      String symbol, Semanticdb.Range range, Semanticdb.SymbolOccurrence.Role role, 
+      String symbol,
+      Semanticdb.Range range,
+      Semanticdb.SymbolOccurrence.Role role,
       java.util.Optional<Semanticdb.Range> enclosingRange) {
-    Semanticdb.SymbolOccurrence.Builder builder = Semanticdb.SymbolOccurrence.newBuilder()
-        .setSymbol(symbol)
-        .setRange(range)
-        .setRole(role);
+    Semanticdb.SymbolOccurrence.Builder builder =
+        Semanticdb.SymbolOccurrence.newBuilder().setSymbol(symbol).setRange(range).setRole(role);
     enclosingRange.ifPresent(builder::setEnclosingRange);
     return builder.build();
   }

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java

@@ -119,9 +119,14 @@ private Optional<Semanticdb.Range> emitSymbolOccurrence(
     return range;
   }
 
-  private void emitSymbolOccurrence(Element sym, Optional<Semanticdb.Range> range, Role role, Optional<Semanticdb.Range> enclosingRange) {
+  private void emitSymbolOccurrence(
+      Element sym,
+      Optional<Semanticdb.Range> range,
+      Role role,
+      Optional<Semanticdb.Range> enclosingRange) {
     if (sym == null) return;
-    Optional<Semanticdb.SymbolOccurrence> occ = semanticdbOccurrence(sym, range, role, enclosingRange);
+    Optional<Semanticdb.SymbolOccurrence> occ =
+        semanticdbOccurrence(sym, range, role, enclosingRange);
     occ.ifPresent(occurrences::add);
   }
 
@@ -463,7 +468,10 @@ private Semanticdb.Range correctForTabs(Semanticdb.Range range, LineMap lineMap,
   }
 
   private Optional<Semanticdb.SymbolOccurrence> semanticdbOccurrence(
-      Element sym, Optional<Semanticdb.Range> range, Role role, Optional<Semanticdb.Range> enclosingRange) {
+      Element sym,
+      Optional<Semanticdb.Range> range,
+      Role role,
+      Optional<Semanticdb.Range> enclosingRange) {
     if (range.isPresent()) {
       String ssym = semanticdbSymbol(sym);
       if (!ssym.equals(SemanticdbSymbols.NONE)) {
@@ -478,10 +486,9 @@ private Optional<Semanticdb.SymbolOccurrence> semanticdbOccurrence(
   }
 
   /**
-   * Computes the enclosing range for the given tree node.
-   * Returns the range of the nearest non-trivial enclosing AST node.
-   * For definition occurrences, this includes the entire definition including documentation.
-   * For reference occurrences, this includes the parent expression bounds.
+   * Computes the enclosing range for the given tree node. Returns the range of the nearest
+   * non-trivial enclosing AST node. For definition occurrences, this includes the entire definition
+   * including documentation. For reference occurrences, this includes the parent expression bounds.
    */
   private Optional<Semanticdb.Range> computeEnclosingRange(Tree tree) {
     if (tree == null) return Optional.empty();
@@ -492,14 +499,16 @@ private Optional<Semanticdb.Range> computeEnclosingRange(Tree tree) {
     // For method, class, and variable definitions, use the tree itself as the enclosing range
     // since we're processing the definition node
     Tree enclosingTree = tree;
-    if (!(tree instanceof MethodTree || tree instanceof ClassTree || tree instanceof VariableTree)) {
+    if (!(tree instanceof MethodTree
+        || tree instanceof ClassTree
+        || tree instanceof VariableTree)) {
       // For non-definition nodes (like references), use the parent
       TreePath parentPath = path.getParentPath();
       if (parentPath == null) return Optional.empty();
       enclosingTree = parentPath.getLeaf();
       if (enclosingTree == null || enclosingTree == compUnitTree) return Optional.empty();
     }
-    
+
     SourcePositions sourcePositions = trees.getSourcePositions();
     int start = (int) sourcePositions.getStartPosition(compUnitTree, enclosingTree);
     int end = (int) sourcePositions.getEndPosition(compUnitTree, enclosingTree);

tests/minimized/src/main/java/minimized/AnnotationParameters.java

@@ -1,41 +1,41 @@
 package minimized;
 
 @interface Bar {
-	double value();
+  double value();
 }
 
 @interface BarB {
-	boolean value();
+  boolean value();
 }
 
 @interface Nullable {
-	String value() default "";
+  String value() default "";
 }
 
 
 @interface BarRef{
-	SuppressWarnings value();
+  SuppressWarnings value();
 }
 
 interface Foo {
-	@Bar(-1d)
-	double test();
+  @Bar(-1d)
+  double test();
 
-	@Bar(~5)
-	@SuppressWarnings(value = "unchecked")
-	double test2();
+  @Bar(~5)
+  @SuppressWarnings(value = "unchecked")
+  double test2();
 
-	@BarB(!true)
-	double test3();
+  @BarB(!true)
+  double test3();
 
-	@Nullable(("what"))
-	Foo test4();
+  @Nullable(("what"))
+  Foo test4();
 
-	@Bar((double) -1)
-	double testCast();
+  @Bar((double) -1)
+  double testCast();
 }
 
 interface TestRef {
-	@BarRef(@SuppressWarnings(value = "unchecked"))
-	abstract double testCase();
+  @BarRef(@SuppressWarnings(value = "unchecked"))
+  abstract double testCase();
 }

tests/minimized/src/main/java/minimized/LombokBuilder.java

@@ -2,5 +2,5 @@
 
 @lombok.Builder
 class Hello {
-	private String message;
+  private String message;
 }

tests/minimized/src/main/java/minimized/TabIndented.java

@@ -1,22 +1,22 @@
 package minimized;
 
 public class TabIndented {
-	public void app() {
-		Object o = new Object() {
-			@Override
-			public boolean equals(Object other) {
-				return false;
-			}
+  public void app() {
+    Object o = new Object() {
+      @Override
+      public boolean equals(Object other) {
+        return false;
+      }
 
-			@Override
-			public int hashCode() {
-				return System.identityHashCode(this);
-			}
+      @Override
+      public int hashCode() {
+        return System.identityHashCode(this);
+      }
 
-			@Override
-			public String toString() {
-				return "";
-			}
-		};
-	}
+      @Override
+      public String toString() {
+        return "";
+      }
+    };
+  }
 }