Skip to content

fix typo. overriden => overridden #12166

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

Merged
merged 1 commit into from
Apr 21, 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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ trait BCodeIdiomatic {
case (Some(release), None) => release
case (None, Some(target)) => target
case (Some(release), Some(_)) =>
report.warning(s"The value of ${ctx.settings.Xtarget.name} was overriden by ${ctx.settings.release.name}")
report.warning(s"The value of ${ctx.settings.Xtarget.name} was overridden by ${ctx.settings.release.name}")
release
case (None, None) => "8" // least supported version by default

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
val src =
if hasAnnotation then "@varargs"
else if isBridge then "overriding a java varargs method"
else "@varargs (on overriden method)"
else "@varargs (on overridden method)"
report.error(s"$src produces a forwarder method that conflicts with ${conflict.showDcl}", original.srcPos)
case Nil =>
forwarder.enteredAfter(thisPhase)
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Typer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3824,7 +3824,7 @@ class Typer extends Namer
}

if isDefiniteNotSubtype then
// We could check whether `equals` is overriden.
// We could check whether `equals` is overridden.
// Reasons for not doing so:
// - it complicates the protocol
// - such code patterns usually implies hidden errors in the code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Spec diff: in section [5.1.4 Overriding](https://www.scala-lang.org/files/archiv

> Why do we want to make this change to the language?

Class shadowing is irregular compared to other types of overrides. Indeed, inner classes are not actually overriden but simply shadowed.
Class shadowing is irregular compared to other types of overrides. Indeed, inner classes are not actually overridden but simply shadowed.


> How much existing code is going to be affected?
Expand Down
4 changes: 2 additions & 2 deletions scaladoc/src/dotty/tools/scaladoc/api.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ enum Origin:
case ImplicitlyAddedBy(name: String, dri: DRI)
case ExtensionFrom(name: String, dri: DRI)
case ExportedFrom(name: String, dri: Option[DRI])
case Overrides(overridenMembers: Seq[Overriden])
case Overrides(overriddenMembers: Seq[Overridden])
case RegularlyDefined

case class Overriden(name: String, dri: DRI)
case class Overridden(name: String, dri: DRI)

case class InheritedFrom(name: String, dri: DRI)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext

def defintionClasses(m: Member) = m.origin match
case Origin.Overrides(defs) =>
def renderDef(d: Overriden): Seq[TagArg] =
def renderDef(d: Overridden): Seq[TagArg] =
Seq(" -> ", signatureRenderer.renderLink(d.name, d.dri))
val headNode = m.inheritedFrom.map(form => signatureRenderer.renderLink(form.name, form.dri))
val tailNodes = defs.flatMap(renderDef)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class StaticSiteContext(
val processedTemplate = // Set provided name as arg in page for `docs`
if from.getParentFile.toPath == docsPath && templateFile.isIndexPage() then
if templateFile.title != "index" then
report.warn("Property `title` will be overriden by project name", from)
report.warn("Property `title` will be overridden by project name", from)

templateFile.copy(title = args.name)
else templateFile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,9 @@ trait ClassLikeSupport:
Kind.Implicit(basicKind, None)
else specificKind(basicKind)

val origin = if !methodSymbol.isOverriden then Origin.RegularlyDefined else
val overridenSyms = methodSymbol.allOverriddenSymbols.map(_.owner)
Origin.Overrides(overridenSyms.map(s => Overriden(s.name, s.dri)).toSeq)
val origin = if !methodSymbol.isOverridden then Origin.RegularlyDefined else
val overriddenSyms = methodSymbol.allOverriddenSymbols.map(_.owner)
Origin.Overrides(overriddenSyms.map(s => Overridden(s.name, s.dri)).toSeq)

mkMember(methodSymbol, methodKind, memberInfo.res.asSignature)(origin = origin, deprecated = methodSymbol.isDeprecated())

Expand Down
2 changes: 1 addition & 1 deletion scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2A

def isExported: Boolean = sym.flags.is(Flags.Exported)

def isOverriden: Boolean = sym.flags.is(Flags.Override)
def isOverridden: Boolean = sym.flags.is(Flags.Override)

def isExtensionMethod: Boolean = sym.flags.is(Flags.ExtensionMethod)

Expand Down
2 changes: 1 addition & 1 deletion tests/run/productElementName.check
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ AuxiliaryConstructor(a=Susan, b=42)
OverloadedApply(a=Susan, b=123)
DefinesProductElementName(foo=Susan, foo=42)
InheritsProductElementName(a=Susan, b=42)
InheritsProductElementName_Override(overriden=Susan, overriden=42)
InheritsProductElementName_Override(overridden=Susan, overridden=42)
InheritsProductElementName_Override_SelfType(a=Susan, b=42)
PrivateMembers(a=10, b=20, c=30, d=40, e=50, f=60)
6 changes: 3 additions & 3 deletions tests/run/productElementName.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ case class DefinesProductElementName(a: String, b: Int) {
}

trait A {
def productElementName(n: Int): String = "overriden"
def productElementName(n: Int): String = "overridden"
}
case class InheritsProductElementName(a: String, b: Int) extends A

trait B extends Product {
override def productElementName(n: Int): String = "overriden"
override def productElementName(n: Int): String = "overridden"
}
case class InheritsProductElementName_Override(a: String, b: Int) extends B

trait C { self: Product =>
override def productElementName(n: Int): String = "overriden"
override def productElementName(n: Int): String = "overridden"
}
case class InheritsProductElementName_Override_SelfType(a: String, b: Int) extends C

Expand Down