Skip to content
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.

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

Don't generate semanticdb files if there are missing #1376

Merged
merged 1 commit into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 14 additions & 37 deletions scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ import java.util.regex.Pattern
import java.util.regex.PatternSyntaxException

import scala.annotation.StaticAnnotation
import scala.tools.nsc.CompilerCommand
import scala.tools.nsc.Settings
import scala.tools.nsc.interactive.Global
import scala.tools.nsc.reporters.StoreReporter
import scala.util.Failure
import scala.util.Success
import scala.util.Try
Expand Down Expand Up @@ -374,46 +370,27 @@ case class Args(
}
}

def configuredGlobal: Configured[LazyValue[Option[Global]]] =
Configured.ok {
LazyValue.fromUnsafe(() => {
val ss = new Settings()
val command = new CompilerCommand(scalacOptions, ss)
val settings = command.settings
settings.YpresentationAnyThread.value = true
settings.classpath.value = validatedClasspath.syntax
val reporter = new StoreReporter()
new Global(settings, reporter, "Scalafix")
})
}

def validate: Configured[ValidatedArgs] = {
baseConfig.andThen { case (base, scalafixConfig, delegator) =>
(
configuredSourceroot |@|
configuredSymtab |@|
configuredRules(base, scalafixConfig) |@|
resolvedPathReplace |@|
configuredDiffDisable |@|
configuredGlobal
).map {
case (
((((root, symtab), rulez), pathReplace), diffDisable),
global
) =>
ValidatedArgs(
this,
symtab,
rulez,
scalafixConfig,
classLoader,
root,
pathReplace,
diffDisable,
delegator,
semanticdbFilterMatcher,
global
)
configuredDiffDisable
).map { case ((((root, symtab), rulez), pathReplace), diffDisable) =>
ValidatedArgs(
this,
symtab,
rulez,
scalafixConfig,
classLoader,
root,
pathReplace,
diffDisable,
delegator,
semanticdbFilterMatcher
)
}
}
}
Expand Down
46 changes: 1 addition & 45 deletions scalafix-cli/src/main/scala/scalafix/internal/v1/MainOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import java.nio.file.attribute.BasicFileAttributes

import scala.annotation.tailrec
import scala.collection.mutable.ListBuffer
import scala.tools.nsc.interactive.Global
import scala.util.Failure
import scala.util.Success
import scala.util.Try
Expand All @@ -21,7 +20,6 @@ import scala.util.control.NonFatal

import scala.meta.Tree
import scala.meta.inputs.Input
import scala.meta.interactive.InteractiveSemanticdb
import scala.meta.internal.semanticdb.TextDocument
import scala.meta.io.AbsolutePath
import scala.meta.parsers.ParseException
Expand All @@ -38,7 +36,6 @@ import org.typelevel.paiges.{Doc => D}
import scalafix.Versions
import scalafix.cli.ExitStatus
import scalafix.interfaces.ScalafixEvaluation
import scalafix.internal.compat.CompilerCompat.XtensionGlobal
import scalafix.internal.config.PrintStreamReporter
import scalafix.internal.diff.DiffUtils
import scalafix.internal.interfaces.ScalafixEvaluationImpl
Expand Down Expand Up @@ -134,7 +131,6 @@ object MainOps {
}
// Then afterComplete for each rule
args.rules.rules.foreach(_.afterComplete())
shutdownCompiler(args.global)

ScalafixEvaluationImpl.from(fileEvaluations, ExitStatus.Ok)
} else
Expand Down Expand Up @@ -254,33 +250,6 @@ object MainOps {
}
}

def compileWithGlobal(
args: ValidatedArgs,
doc: SyntacticDocument
): Option[TextDocument] = {
args.global.value.map { g =>
val result =
try {
InteractiveSemanticdb.toTextDocument(
g,
doc.input.text,
doc.internal.input.syntax,
10000,
Nil
)
} catch {
case NonFatal(_) =>
TextDocument.defaultInstance
}
g.unitOfFile.clear()
result.withMd5(
FingerprintOps.md5(
StandardCharsets.UTF_8.encode(CharBuffer.wrap(doc.input.chars))
)
)
}
}

def unsafeHandleFile(args: ValidatedArgs, file: AbsolutePath): ExitStatus = {
val input = args.input(file)
val result =
Expand Down Expand Up @@ -334,8 +303,7 @@ object MainOps {
doc,
relpath,
args.classLoader,
args.symtab,
() => compileWithGlobal(args, doc)
args.symtab
)
val result =
args.rules.semanticPatch(sdoc, args.args.autoSuppressLinterErrors)
Expand All @@ -351,17 +319,6 @@ object MainOps {
}
}

private def shutdownCompiler(global: LazyValue[Option[Global]]): Unit = {
global.foreach(_.foreach(g => {
try {
g.askShutdown()
g.closeCompat()
} catch {
case NonFatal(_) =>
}
}))
}

def previewPatches(
patches: Seq[v0.Patch],
ctx: RuleCtx,
Expand Down Expand Up @@ -453,7 +410,6 @@ object MainOps {
}

args.rules.rules.foreach(_.afterComplete())
shutdownCompiler(args.global)

adjustExitCode(args, exit, files)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package scalafix.internal.v1

import scala.tools.nsc.interactive.Global

import scala.meta.AbsolutePath
import scala.meta.Input
import scala.meta.Source
Expand All @@ -24,8 +22,7 @@ case class ValidatedArgs(
pathReplace: AbsolutePath => AbsolutePath,
diffDisable: DiffDisable,
callback: DelegatingMainCallback,
semanticdbFileFilter: FilterMatcher,
global: LazyValue[Option[Global]]
semanticdbFileFilter: FilterMatcher
) {

def input(file: AbsolutePath): Input =
Expand Down
19 changes: 4 additions & 15 deletions scalafix-core/src/main/scala/scalafix/v1/SemanticDocument.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package scalafix.v1

import scala.meta._
import scala.meta.contrib.AssociatedComments
import scala.meta.internal.semanticdb.TextDocument
import scala.meta.internal.symtab.SymbolTable
import scala.meta.internal.{semanticdb => s}
import scala.meta.io.RelativePath
Expand Down Expand Up @@ -54,8 +53,7 @@ object SemanticDocument {
doc: SyntacticDocument,
path: RelativePath,
classLoader: ClassLoader,
symtab: SymbolTable,
compile: () => Option[TextDocument]
symtab: SymbolTable
): SemanticDocument = {
val semanticdbRelPath = s"META-INF/semanticdb/$path.semanticdb"
Option(classLoader.getResourceAsStream(semanticdbRelPath)) match {
Expand All @@ -70,19 +68,10 @@ object SemanticDocument {
val impl = new InternalSemanticDoc(doc, LazyValue.now(sdoc), symtab)
new SemanticDocument(impl)
case None =>
new SemanticDocument(
new InternalSemanticDoc(
doc,
LazyValue.later { () =>
compile().getOrElse {
throw new Error.MissingSemanticdb(
path.toURI(false).toString()
)
}
},
symtab
)
throw Error.MissingSemanticdb(
path.toURI(false).toString()
)
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ object RuleTest {
doc,
test.semanticdbPath,
classLoader,
symtab,
() => None
symtab
)
val decoderSettings =
RuleDecoder.Settings().withConfig(scalafixConfig)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import scala.meta.testkit.StringFS

import scalafix.cli._
import scalafix.tests.core.Classpaths
import scalafix.tests.util.ScalaVersions

class CliSemanticSuite extends BaseCliSuite {

Expand Down Expand Up @@ -235,7 +234,7 @@ class CliSemanticSuite extends BaseCliSuite {
|ExplicitResultTypes.memberVisibility = [Public, Protected]
|""".stripMargin
)
val (out, exit) = runMain(
val (_, exit) = runMain(
Array(
"--files",
"NoSemanticdb.scala",
Expand All @@ -244,63 +243,6 @@ class CliSemanticSuite extends BaseCliSuite {
),
root.toNIO
)
assert(exit.isOk)
val obtained =
FileIO.slurp(root.resolve("NoSemanticdb.scala"), StandardCharsets.UTF_8)
assertNoDiff(
obtained,
"""
|package a
|object NoSemanticdb {
| def foo: Option[Int] = None
|}
|""".stripMargin
)
}

test("on-demand with scalacOptions") {
val warnUnused =
if (ScalaVersions.isScala213) "-Wunused:imports"
else "-Ywarn-unused-import"

val root = StringFS.fromString(
"""|/NoSemanticdb2.scala
|package b
|import scala.concurrent.Future
|object a {
| val x = _root_.scala.List()
| x + "string"
|}
|/.scalafix.conf
|rules = RemoveUnused
|""".stripMargin
)
val (out, exit) = runMain(
Array(
"--files",
"NoSemanticdb2.scala",
"--classpath",
defaultClasspath,
"--scalac-options",
warnUnused
),
root.toNIO
)
assert(exit.isOk)
val obtained =
FileIO.slurp(
root.resolve("NoSemanticdb2.scala"),
StandardCharsets.UTF_8
)
assertNoDiff(
obtained,
"""
|package b
|object a {
| val x = _root_.scala.List()
| x + "string"
|}
|""".stripMargin
)
assert(exit.is(ExitStatus.MissingSemanticdbError))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ object BaseSemanticSuite {
doc,
relpath,
ClasspathOps.thisClassLoaderWith(BuildInfo.semanticClasspath.toURI.toURL),
symtab,
() => None
symtab
)
}
}
Expand Down