Skip to content

Commit 3c48b0b

Browse files
committed
Fix code actions + remove unused imports
1 parent 6498c18 commit 3c48b0b

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

presentation-compiler/src/main/dotty/tools/pc/DiagnosticProvider.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@ import org.eclipse.lsp4j.DiagnosticSeverity
55
import dotty.tools.dotc.interactive.InteractiveDriver
66
import dotty.tools.dotc.interfaces.Diagnostic as DiagnosticInterfaces
77
import dotty.tools.dotc.reporting.Diagnostic
8-
import dotty.tools.dotc.semanticdb.DiagnosticOps.toSemanticDiagnostic
98
import dotty.tools.pc.utils.InteractiveEnrichments.toLsp
109

1110
import scala.meta.pc.VirtualFileParams
12-
import com.google.gson.Gson
1311
import ch.epfl.scala.bsp4j
1412
import dotty.tools.dotc.reporting.CodeAction
1513
import dotty.tools.dotc.rewrites.Rewrites.ActionPatch
1614
import scala.jdk.CollectionConverters.*
1715
import dotty.tools.dotc.core.Contexts.Context
18-
import dotty.tools.dotc.reporting.Message
19-
import dotty.tools.dotc.interfaces.DiagnosticRelatedInformation
20-
import org.eclipse.lsp4j.Location
2116
import dotty.tools.dotc.reporting.ErrorMessageID
2217
import org.eclipse.lsp4j.DiagnosticTag
2318

@@ -40,8 +35,9 @@ class DiagnosticProvider(driver: InteractiveDriver, params: VirtualFileParams):
4035

4136
val scalaDiagnostic = new bsp4j.ScalaDiagnostic()
4237
val actions = diag.msg.actions.map(toBspScalaAction).asJava
38+
scalaDiagnostic.setActions(actions)
4339
// lspDiag.setRelatedInformation(???) Currently not emitted by the compiler
44-
lspDiag.setData(actions)
40+
lspDiag.setData(scalaDiagnostic)
4541
if diag.msg.errorId == ErrorMessageID.UnusedSymbolID then
4642
lspDiag.setTags(List(DiagnosticTag.Unnecessary).asJava)
4743

presentation-compiler/test/dotty/tools/pc/tests/DiagnosticProviderSuite.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,15 @@ import dotty.tools.pc.base.BasePCSuite
66
import dotty.tools.pc.utils.RangeReplace
77

88
import java.net.URI
9-
import org.eclipse.lsp4j.jsonrpc.messages.{Either => JEither}
109
import scala.meta.internal.jdk.CollectionConverters.*
1110
import scala.meta.internal.metals.CompilerVirtualFileParams
1211
import scala.meta.internal.metals.EmptyCancelToken
13-
import scala.meta.internal.pc.PcReferencesRequest
1412

1513
import org.junit.Test
16-
import scala.collection.mutable.ListBuffer
1714
import org.eclipse.lsp4j.DiagnosticSeverity
18-
import scala.concurrent.duration.*
1915
import dotty.tools.pc.utils.TestExtensions.getOffset
2016

2117
class DiagnosticProviderSuite extends BasePCSuite with RangeReplace {
22-
private val rangeRegex = "<<.*>>".r
2318
case class TestDiagnostic(startIndex: Int, endIndex: Int, msg: String, severity: DiagnosticSeverity)
2419

2520
def check(

0 commit comments

Comments
 (0)