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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

chore: Revert sbt-scalafix upgrade to fix OOM #6229

Closed
wants to merge 1 commit into from
Closed

chore: Revert sbt-scalafix upgrade to fix OOM #6229

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .scalafix3.conf
View file
Open in desktop
Expand Up @@ -11,4 +11,3 @@ OrganizeImports.groups = [
"scala.meta."
"*"
]
OrganizeImports.targetDialect = StandardLayout
2 changes: 0 additions & 2 deletions .scalafmt.conf
View file
Open in desktop
Expand Up @@ -21,8 +21,6 @@ project.excludeFilters = [
"tests/unit/src/test/resources"
"tests/input/src/main/scala"
"mtags/src/main/scala-2.11/scala/tools/nsc/symtab/classfile/ClassfileParser.scala"
"mtags/src/main/scala-3-wrapper"
"mtags/src/main/scala-3."
]

fileOverride {
Expand Down
1 change: 1 addition & 0 deletions build.sbt
View file
Open in desktop
Expand Up @@ -66,6 +66,7 @@ inThisBuild(
resolvers ++= Resolver.sonatypeOssRepos("public"),
resolvers ++= Resolver.sonatypeOssRepos("snapshot"),
dependencyOverrides += V.guava,
semanticdbVersion := V.semanticdb(scalaVersion.value),
// faster publishLocal:
packageDoc / publishArtifact := sys.env.contains("CI"),
packageSrc / publishArtifact := sys.env.contains("CI"),
Expand Down
6 changes: 3 additions & 3 deletions mtags/src/main/scala-3-wrapper/ScalaPresentationCompiler.scala
View file
Open in desktop
Expand Up @@ -5,11 +5,11 @@ import java.nio.file.Path
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ExecutorService
import java.util.concurrent.ScheduledExecutorService
import java.{util => ju}
import java.{util as ju}

import scala.concurrent.ExecutionContext
import scala.concurrent.ExecutionContextExecutor
import scala.jdk.CollectionConverters._
import scala.jdk.CollectionConverters.*

import scala.meta.internal.metals.ReportLevel
import scala.meta.pc.AutoImportsResult
Expand All @@ -25,7 +25,7 @@ import scala.meta.pc.RangeParams
import scala.meta.pc.SymbolSearch
import scala.meta.pc.VirtualFileParams

import dotty.tools.pc.{ScalaPresentationCompiler => DottyPresentationCompiler}
import dotty.tools.pc.{ScalaPresentationCompiler as DottyPresentationCompiler}
import org.eclipse.lsp4j.CompletionItem
import org.eclipse.lsp4j.CompletionList
import org.eclipse.lsp4j.Diagnostic
Expand Down
6 changes: 3 additions & 3 deletions mtags/src/main/scala-3.3.3/scala/meta/internal/pc/printer/RefinedDotcPrinter.scala
View file
Open in desktop
@@ -1,9 +1,9 @@
package scala.meta.internal.pc.printer

import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.core.Types._
import dotty.tools.dotc.core.Flags.*
import dotty.tools.dotc.core.StdNames.*
import dotty.tools.dotc.core.Types.*
import dotty.tools.dotc.printing.RefinedPrinter
import dotty.tools.dotc.printing.Texts.Text

Expand Down
4 changes: 2 additions & 2 deletions mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSealedDesc.scala
View file
Open in desktop
@@ -1,8 +1,8 @@
package scala.meta.internal.pc

import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Flags._
import dotty.tools.dotc.core.StdNames._
import dotty.tools.dotc.core.Flags.*
import dotty.tools.dotc.core.StdNames.*
import dotty.tools.dotc.core.Symbols.Symbol

object MetalsSealedDesc:
Expand Down
4 changes: 2 additions & 2 deletions mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSignatures.scala
View file
Open in desktop
@@ -1,8 +1,8 @@
package scala.meta.internal.pc

import dotty.tools.dotc.ast.tpd
import dotty.tools.dotc.core.Contexts._
import dotty.tools.dotc.core.Denotations._
import dotty.tools.dotc.core.Contexts.*
import dotty.tools.dotc.core.Denotations.*
import dotty.tools.dotc.util.Signatures
import dotty.tools.dotc.util.Signatures.Signature
import dotty.tools.dotc.util.SourcePosition
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ object MtagsEnrichments extends ScalametaCommonEnrichments:
new SourcePosition(source, span)
end sourcePosition

def latestRun =
def latestRun =
if driver.currentCtx.run.units.nonEmpty then
driver.currentCtx.run.units.head
else
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/ExtractMethodProvider.scala
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ import dotty.tools.dotc.interactive.Interactive
import dotty.tools.dotc.interactive.InteractiveDriver
import dotty.tools.dotc.util.SourceFile
import dotty.tools.dotc.util.SourcePosition
import org.eclipse.lsp4j as l
import org.eclipse.lsp4j.TextEdit
import org.eclipse.lsp4j as l

final class ExtractMethodProvider(
range: RangeParams,
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/InferredTypeProvider.scala
View file
Open in desktop
Expand Up @@ -26,8 +26,8 @@ import dotty.tools.dotc.util.SourceFile
import dotty.tools.dotc.util.SourcePosition
import dotty.tools.dotc.util.Spans
import dotty.tools.dotc.util.Spans.Span
import org.eclipse.lsp4j as l
import org.eclipse.lsp4j.TextEdit
import org.eclipse.lsp4j as l

/**
* Tries to calculate edits needed to insert the inferred type annotation
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/PcInlayHintsProvider.scala
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@ import dotty.tools.dotc.interactive.InteractiveDriver
import dotty.tools.dotc.util.SourceFile
import dotty.tools.dotc.util.SourcePosition
import dotty.tools.dotc.util.Spans.Span
import org.eclipse.lsp4j as l
import org.eclipse.lsp4j.InlayHint
import org.eclipse.lsp4j.InlayHintKind
import org.eclipse.lsp4j as l

class PcInlayHintsProvider(
driver: InteractiveDriver,
Expand Down
4 changes: 2 additions & 2 deletions mtags/src/main/scala-3/scala/meta/internal/pc/ScalaPresentationCompiler.scala
View file
Open in desktop
Expand Up @@ -3,11 +3,11 @@ package scala.meta.internal.pc
import java.io.File
import java.net.URI
import java.nio.file.Path
import java.util as ju
import java.util.Optional
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ExecutorService
import java.util.concurrent.ScheduledExecutorService
import java.util as ju

import scala.collection.JavaConverters.*
import scala.concurrent.ExecutionContext
Expand All @@ -27,9 +27,9 @@ import scala.meta.pc.*
import scala.meta.pc.PcSymbolInformation as IPcSymbolInformation

import dotty.tools.dotc.reporting.StoreReporter
import org.eclipse.lsp4j as l
import org.eclipse.lsp4j.DocumentHighlight
import org.eclipse.lsp4j.TextEdit
import org.eclipse.lsp4j as l

case class ScalaPresentationCompiler(
buildTargetIdentifier: String = "",
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/completions/AmmoniteFileCompletions.scala
View file
Open in desktop
Expand Up @@ -6,8 +6,8 @@ import java.nio.file.Path

import scala.meta.internal.mtags.MtagsEnrichments.*

import dotty.tools.dotc.ast.tpd.*
import dotty.tools.dotc.ast.tpd.Tree
import dotty.tools.dotc.ast.tpd.*
import dotty.tools.dotc.ast.untpd.ImportSelector
import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.StdNames.*
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala
View file
Open in desktop
Expand Up @@ -27,8 +27,8 @@ import org.eclipse.lsp4j.CompletionItemKind
import org.eclipse.lsp4j.CompletionList
import org.eclipse.lsp4j.InsertTextFormat
import org.eclipse.lsp4j.InsertTextMode
import org.eclipse.lsp4j.Range as LspRange
import org.eclipse.lsp4j.TextEdit
import org.eclipse.lsp4j.Range as LspRange

class CompletionProvider(
search: SymbolSearch,
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/completions/OverrideCompletions.scala
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@ import scala.meta.pc.PresentationCompilerConfig
import scala.meta.pc.PresentationCompilerConfig.OverrideDefFormat
import scala.meta.pc.SymbolSearch

import dotty.tools.dotc.ast.tpd.*
import dotty.tools.dotc.ast.tpd.Tree
import dotty.tools.dotc.ast.tpd.*
import dotty.tools.dotc.core.Contexts.Context
import dotty.tools.dotc.core.Flags
import dotty.tools.dotc.core.Flags.*
Expand Down
2 changes: 1 addition & 1 deletion mtags/src/main/scala-3/scala/meta/internal/pc/printer/MetalsPrinter.scala
View file
Open in desktop
Expand Up @@ -24,8 +24,8 @@ import dotty.tools.dotc.core.Names.Name
import dotty.tools.dotc.core.StdNames
import dotty.tools.dotc.core.Symbols.NoSymbol
import dotty.tools.dotc.core.Symbols.Symbol
import dotty.tools.dotc.core.Types.*
import dotty.tools.dotc.core.Types.Type
import dotty.tools.dotc.core.Types.*

class MetalsPrinter(
names: ShortenedNames,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
@@ -1,5 +1,5 @@
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
Expand Down