Skip to content

Commit

Permalink
Merged branch idea243.release into idea243.x
Browse files Browse the repository at this point in the history
  • Loading branch information
builduser committed Feb 6, 2025
2 parents a0d8540 + 4a0bf25 commit e8e52f4
Show file tree
Hide file tree
Showing 6 changed files with 313 additions and 40 deletions.
8 changes: 6 additions & 2 deletions ...-integration/src/org/jetbrains/plugins/scala/compiler/highlighting/CompilerMessages.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ private object CompilerMessages {
def isUnusedImport(description: String): Boolean =
description.trim.equalsIgnoreCase("unused import")

def isNeedsToBeAbstract(description: String): Boolean =
description.contains("needs to be abstract")
def isNeedsToBeAbstract(description: String): Boolean = {
val trimmedDescription = description.trim

trimmedDescription.contains("needs to be abstract") ||
trimmedDescription.startsWith("object creation impossible")
}

def isNoWarningsCanBeIncurred(description: String): Boolean =
description.trim.equalsIgnoreCase("No warnings can be incurred under -Werror (or -Xfatal-warnings)")
Expand Down
30 changes: 20 additions & 10 deletions ...n/src/org/jetbrains/plugins/scala/compiler/highlighting/ExternalHighlightersService.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.jetbrains.plugins.scala.codeInspection.declarationRedundancy.ScalaOpt
import org.jetbrains.plugins.scala.compiler.diagnostics.Action
import org.jetbrains.plugins.scala.compiler.highlighting.ExternalHighlighting.RangeInfo
import org.jetbrains.plugins.scala.editor.DocumentExt
import org.jetbrains.plugins.scala.extensions.{ObjectExt, Parent, PsiElementExt, executeOnPooledThread, invokeLater}
import org.jetbrains.plugins.scala.extensions.{IteratorExt, ObjectExt, Parent, PsiElementExt, executeOnPooledThread, invokeLater}
import org.jetbrains.plugins.scala.lang.psi.api.base.{ScReference, ScStableCodeReference}
import org.jetbrains.plugins.scala.lang.psi.api.expr.ScMethodCall
import org.jetbrains.plugins.scala.lang.psi.api.toplevel.imports.usages.ImportUsed
Expand Down Expand Up @@ -264,16 +264,26 @@ private final class ExternalHighlightersService(project: Project) { self =>
.registerFix(new ScalaOptimizeImportsFix, null, null, unusedImportRange, null)
} else standardBuilder
} else if (highlighting.diagnostics.isEmpty && CompilerMessages.isNeedsToBeAbstract(description)) {
def builderWithNeedsToBeAbstractFixes(td: ScTemplateDefinition) = {
val fixes = ScTemplateDefinitionAnnotator.needsToBeAbstractFixes(td)
fixes.foldLeft(standardBuilder) {
case (builder, fix: ModCommandAction) =>
//noinspection ApiStatus
builder.registerFix(fix, null, null, highlightRange, null)
case (builder, fix: IntentionAction) =>
builder.registerFix(fix, null, null, highlightRange, null)
case (builder, _) => builder
}
}

psiFile.findElementAt(highlightRange.getStartOffset) match {
case Parent(td: ScTemplateDefinition) =>
val fixes = ScTemplateDefinitionAnnotator.needsToBeAbstractFixes(td)
fixes.foldLeft(standardBuilder) {
case (builder, fix: ModCommandAction) =>
//noinspection ApiStatus
builder.registerFix(fix, null, null, highlightRange, null)
case (builder, fix: IntentionAction) =>
builder.registerFix(fix, null, null, highlightRange, null)
case (builder, _) => builder
// [class|object] <startOffset>Foo ...
case Parent(td: ScTemplateDefinition) => builderWithNeedsToBeAbstractFixes(td)
case Parent(ref: ScStableCodeReference) =>
ref.parentsInFile.findByType[ScTemplateDefinition] match {
// [new|given] <startOffset>Foo ...
case Some(td) => builderWithNeedsToBeAbstractFixes(td)
case _ => standardBuilder
}
case _ => standardBuilder
}
Expand Down
275 changes: 258 additions & 17 deletions ...est/org/jetbrains/plugins/scala/compiler/highlighting/ScalaCompilerHighlightingTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package compiler.highlighting
import com.intellij.codeInsight.daemon.QuickFixBundle
import com.intellij.lang.annotation.HighlightSeverity
import com.intellij.openapi.util.TextRange
import org.intellij.lang.annotations.Language
import org.jetbrains.plugins.scala.codeInspection.ScalaInspectionBundle

class ScalaCompilerHighlightingTest_2_13 extends ScalaCompilerHighlightingTestBase with ScalaCompilerHighlightingCommonScala2Scala3Test {
Expand Down Expand Up @@ -381,27 +382,145 @@ abstract class ScalaCompilerHighlightingTest_3 extends ScalaCompilerHighlighting
}

// SCL-19751
private def runTestNotImplementedMembers(): Unit = runTestCase(
fileName = "NotImplementedMembers.scala",
content =
override protected def runTestNotImplementedMembers(): Unit = {
@Language("Scala 3")
val fileText =
"""
|trait Something(x: Int):
| def implementMe: Unit
|trait Something1(x: Int):
| def implementMe(): Unit
|
|class X extends Something(10)
|""".stripMargin,
expectedResult = expectedResult(ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
range = Some(TextRange.create(57, 58)),
quickFixDescriptions = Seq("Make 'X' abstract", "Implement members"),
msgPrefix = "class X needs to be abstract, since def implementMe: Unit in trait Something is not defined"
))
)
|trait Something2(y: Int):
| def implementMe1(): Unit
| def implementMe2(): Unit
| def implementMe3(): Unit
|
|object Test:
| val v1 = new Something1(1) {}
| val v2 = new Something2(2) {}
| val v3 = new Something1(3) with Something2(4) {}
|
| class C1 extends Something1(5)
| class C2 extends Something2(6)
| class C3 extends Something1(7) with Something2(8)
|
| object O1 extends Something1(9)
| object O2 extends Something2(10)
| object O3 extends Something1(11) with Something2(12)
|
| given Something1(13) with {}
| given Something2(14) with {}
| given Something1(15) with Something2(16) with {}
|end Test
|""".stripMargin

def testNotImplementedMembers(): Unit = runTestNotImplementedMembers()
val objectCreationImpossible = "object creation impossible,"
def classNeedsToBeAbstract(name: String) = s"class $name needs to be abstract,"

def testNotImplementedMembers_UseCompilerRangesDisabled(): Unit = withUseCompilerRangesDisabled {
runTestNotImplementedMembers()
def makeAbstract(name: String) = s"Make '$name' abstract"
val implementMembers = "Implement members"

runTestCase(
fileName = "Test.scala",
content = fileText,
expectedResult = expectedResult(
// val v1 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `new` in Scala 3
range = Some(TextRange.create(186, 189)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// val v2 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `new` in Scala 3
range = Some(TextRange.create(218, 221)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// val v3 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `new` in Scala 3
range = Some(TextRange.create(250, 253)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// class C1 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C1`
range = Some(TextRange.create(299, 301)),
quickFixDescriptions = Seq(makeAbstract("C1"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C1"),
),
// class C2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C2`
range = Some(TextRange.create(332, 334)),
quickFixDescriptions = Seq(makeAbstract("C2"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C2"),
),
// class C3 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C3`
range = Some(TextRange.create(365, 367)),
quickFixDescriptions = Seq(makeAbstract("C3"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C3"),
),
// object O1 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O1`
range = Some(TextRange.create(419, 421)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// object O2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O2`
range = Some(TextRange.create(453, 455)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// object O3 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O3`
range = Some(TextRange.create(488, 490)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// given Something1 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something1`
range = Some(TextRange.create(543, 553)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// given Something2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something2`
range = Some(TextRange.create(574, 584)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// given Something1(...) with Something2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something1`
range = Some(TextRange.create(605, 615)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
)
)
}
}

Expand Down Expand Up @@ -454,4 +573,126 @@ trait ScalaCompilerHighlightingCommonScala2Scala3Test {
def testAbstractMethodInClass_UseCompilerRangesDisabled(): Unit = withUseCompilerRangesDisabled {
runTestAbstractMethodInClass()
}

// SCL-19751
protected def runTestNotImplementedMembers(): Unit = {
@Language("Scala")
val fileText =
"""
|trait Something1 {
| def implementMe(): Unit
|}
|
|trait Something2 {
| def implementMe1(): Unit
| def implementMe2(): Unit
| def implementMe3(): Unit
|}
|
|object Test {
| val v1 = new Something1 {}
| val v2 = new Something2 {}
| val v3 = new Something1 with Something2 {}
|
| class C1 extends Something1
| class C2 extends Something2
| class C3 extends Something1 with Something2
|
| object O1 extends Something1
| object O2 extends Something2
| object O3 extends Something1 with Something2
|}
|""".stripMargin

val objectCreationImpossible = "object creation impossible."
def classNeedsToBeAbstract(name: String) = s"class $name needs to be abstract."

def makeAbstract(name: String) = s"Make '$name' abstract"
val implementMembers = "Implement members"

runTestCase(
fileName = "Test.scala",
content = fileText,
expectedResult = expectedResult(
// val v1 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something1 {}` in Scala 2
range = Some(TextRange.create(181, 194)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// val v2 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something2 {}` in Scala 2
range = Some(TextRange.create(210, 223)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// val v3 = ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `Something1 with Something2 {}` in Scala 2
range = Some(TextRange.create(239, 268)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// class C1 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C1`
range = Some(TextRange.create(278, 280)),
quickFixDescriptions = Seq(makeAbstract("C1"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C1"),
),
// class C2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C2`
range = Some(TextRange.create(308, 310)),
quickFixDescriptions = Seq(makeAbstract("C2"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C2"),
),
// class C3 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `C3`
range = Some(TextRange.create(338, 340)),
quickFixDescriptions = Seq(makeAbstract("C3"), implementMembers),
msgPrefix = classNeedsToBeAbstract("C3"),
),
// object O1 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O1`
range = Some(TextRange.create(386, 388)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// object O2 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O2`
range = Some(TextRange.create(417, 419)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
// object O3 ...
ExpectedHighlighting(
severity = HighlightSeverity.ERROR,
// highlights `O3`
range = Some(TextRange.create(448, 450)),
quickFixDescriptions = Seq(implementMembers),
msgPrefix = objectCreationImpossible,
),
)
)
}

def testNotImplementedMembers(): Unit = runTestNotImplementedMembers()

def testNotImplementedMembers_UseCompilerRangesDisabled(): Unit = withUseCompilerRangesDisabled {
runTestNotImplementedMembers()
}
}
15 changes: 5 additions & 10 deletions ...ala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/expr/ApplyOrUpdateInvocation.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ case class ApplyOrUpdateInvocation(

object ApplyOrUpdateInvocation {
def apply(
gen: ScGenericCall,
tp: ScType,
isDynamic: Boolean,
gen: ScGenericCall,
tp: ScType,
isDynamic: Boolean,
stripTypeArgs: Boolean
): ApplyOrUpdateInvocation = {
ApplyOrUpdateInvocation(
Expand Down Expand Up @@ -186,11 +186,6 @@ object ApplyOrUpdateInvocation {
}

def innerSrrHasTypeParameters(srr: ScalaResolveResult): Boolean =
srr.name == CommonNames.Apply && srr.innerResolveResult.exists {
_.element match {
case tpo: PsiTypeParameterListOwner => tpo.getTypeParameters.nonEmpty
case tpo: ScTypeParametersOwner => tpo.typeParameters.nonEmpty
case _ => false
}
}
srr.name == CommonNames.Apply &&
srr.innerResolveResult.fold(false)(_.elementHasTypeParameters)
}
6 changes: 5 additions & 1 deletion .../scala-impl/src/org/jetbrains/plugins/scala/lang/psi/impl/expr/MethodInvocationImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ abstract class MethodInvocationImpl(node: ASTNode) extends ScExpressionImplBase(
val stripTypeArgs =
getEffectiveInvokedExpr match {
case gen: ScGenericCall =>
gen.bindInvokedExpr.forall(ApplyOrUpdateInvocation.innerSrrHasTypeParameters)
val invoked = gen.bindInvokedExpr
invoked.forall { srr =>
ApplyOrUpdateInvocation.innerSrrHasTypeParameters(srr) ||
srr.elementHasTypeParameters
}
case _ => true
}

Expand Down
Loading

0 comments on commit e8e52f4

Please sign in to comment.