Merge pull request #493 from ckipp01/darnFunctions

sourcegraph · Aug 22, 2022 · d582189 · d582189
2 parents d54ebf2 + 46ef27e
commit d582189
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java b/scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java
@@ -23,6 +23,8 @@ public class SignatureFormatter {
 
   private static final Type NOTHING_SYMBOL = typeRef("scala/Nothing#");
   private static final String FUNCTION_SYMBOL_PREFIX = "scala/Function";
+  // Special case scala/Function object to not conflict with Function1 for example
+  private static final String FUNCTION_OBJECT = "scala/Function.";
   private static final String TUPLE_SYMBOL_PREFIX = "scala/Tuple";
   private static final String ARRAY_SYMBOL = "scala/Array#";
   private static final String ENUM_SYMBOL = "java/lang/Enum#";
@@ -557,7 +559,10 @@ private String formatType(Type type) {
           b.append(formatType(typeRef.getTypeArguments(0)));
           b.append("[]");
         }
-      } else if (isScala && typeRef.getSymbol().startsWith(FUNCTION_SYMBOL_PREFIX)) {
+      } else if (isScala
+          && typeRef.getSymbol().startsWith(FUNCTION_SYMBOL_PREFIX)
+          && typeRef.getTypeArgumentsCount() > 0
+          && !typeRef.getSymbol().startsWith(FUNCTION_OBJECT)) {
         int n = typeRef.getTypeArgumentsCount() - 1;
         if (n == 0) {
           // Special-case for Function1[A, B]: don't wrap `A`  in parenthesis like this `(A) => B`