Skip to content

Start emitting SymbolInformation for Scala package repos. #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2021
Merged

Start emitting SymbolInformation for Scala package repos. #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lazy val V =
def scala212 = "2.12.14"
def scala211 = "2.11.12"
def scala3 = "3.0.1"
def metals = "0.10.5"
def metals = "0.10.6-M1"
def scalameta = "4.4.25"
def testcontainers = "0.39.3"
def requests = "0.6.5"
Expand Down
30 changes: 30 additions & 0 deletions lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/LsifBuildTool.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ import java.nio.file.Paths
import java.nio.file.SimpleFileVisitor
import java.nio.file.StandardOpenOption
import java.nio.file.attribute.BasicFileAttributes
import java.util
import java.util.Collections
import java.util.Optional
import java.util.ServiceLoader
import java.util.concurrent.TimeUnit

import scala.collection.mutable.ListBuffer
import scala.jdk.CollectionConverters._
Expand All @@ -22,6 +26,7 @@ import scala.util.Try
import scala.util.control.NonFatal

import scala.meta.pc.PresentationCompiler
import scala.meta.pc.PresentationCompilerConfig

import com.sourcegraph.io.DeleteVisitor
import com.sourcegraph.lsif_java.BuildInfo
Expand Down Expand Up @@ -244,6 +249,31 @@ class LsifBuildTool(index: IndexCommand) extends BuildTool("LSIF", index) {
val compiler = compilers
.next()
.newInstance("lsif-java", classpath.asJava, List[String]().asJava)
.withConfiguration(
new PresentationCompilerConfig {
override def parameterHintsCommand(): Optional[String] =
Optional.empty()
override def completionCommand(): Optional[String] =
Optional.empty()
override def symbolPrefixes(): util.Map[String, String] =
Collections.emptyMap()
override def isDefaultSymbolPrefixes: Boolean = false
override def overrideDefFormat()
: PresentationCompilerConfig.OverrideDefFormat =
PresentationCompilerConfig.OverrideDefFormat.Ascii
override def isCompletionItemDetailEnabled: Boolean = false
override def isStripMarginOnTypeFormattingEnabled: Boolean = false
override def isCompletionItemDocumentationEnabled: Boolean = false
override def isHoverDocumentationEnabled: Boolean = false
override def snippetAutoIndent(): Boolean = false
override def isSignatureHelpDocumentationEnabled: Boolean = false
override def isCompletionSnippetsEnabled: Boolean = false
override def timeoutDelay(): Long = 0
override def timeoutUnit(): TimeUnit = TimeUnit.SECONDS
override def semanticdbCompilerOptions(): util.List[String] =
Collections.emptyList()
}
)
try {
fn(compiler)
} finally {
Expand Down
6 changes: 4 additions & 2 deletions lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,10 @@ private void formatScalaMethodSignature(MethodSignature methodSignature) {
? "this"
: symbolInformation.getDisplayName());
formatScalaParameterList(methodSignature.getParameterListsList());
printKeyword(":");
s.append(this.formatType(methodSignature.getReturnType()));
if (symbolInformation.getKind() != SymbolInformation.Kind.CONSTRUCTOR) {
printKeyword(":");
s.append(this.formatType(methodSignature.getReturnType()));
}
}

private Optional<MethodSignature> primaryConstructor(ClassSignature classSignature) {
Expand Down
6 changes: 3 additions & 3 deletions tests/snapshots/src/main/generated/minimized/MinimizedScalaSignatures.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package minimized

case class MinimizedCaseClass(value: String) {
// ^^^^^^^^^^^^^^^^^^ definition minimized/MinimizedCaseClass# case class MinimizedCaseClass(value: String)
// definition minimized/MinimizedCaseClass#`<init>`(). def this(value: String):
// definition minimized/MinimizedCaseClass#`<init>`(). def this(value: String)
// ^^^^^ definition minimized/MinimizedCaseClass#value. val value: String
// ^^^^^^ reference scala/Predef.String#
def this() = this("value")
// ^^^^ definition minimized/MinimizedCaseClass#`<init>`(+1). def this():
// ^^^^ definition minimized/MinimizedCaseClass#`<init>`(+1). def this()
// reference minimized/MinimizedCaseClass#`<init>`().
}

Expand All @@ -34,7 +34,7 @@ trait MinimizedTrait[T] extends AutoCloseable {

class MinimizedScalaSignatures extends AutoCloseable with java.io.Serializable {
// ^^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/MinimizedScalaSignatures# class MinimizedScalaSignatures
// definition minimized/MinimizedScalaSignatures#`<init>`(). def this():
// definition minimized/MinimizedScalaSignatures#`<init>`(). def this()
// ^^^^^^^^^^^^^ reference java/lang/AutoCloseable#
// reference java/lang/Object#`<init>`().
// ^^^^ reference java/
Expand Down