diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala index 614548ff361e..63dc4f430abc 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala @@ -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 diff --git a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala index f4d11f5a51a3..8068e88bf874 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala @@ -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) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 393e7042a91a..b6160b4e2045 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -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 diff --git a/docs/docs/reference/dropped-features/class-shadowing-spec.md b/docs/docs/reference/dropped-features/class-shadowing-spec.md index 427337a63df8..458385c133ac 100644 --- a/docs/docs/reference/dropped-features/class-shadowing-spec.md +++ b/docs/docs/reference/dropped-features/class-shadowing-spec.md @@ -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? diff --git a/scaladoc/src/dotty/tools/scaladoc/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala index cc1ac9a9bc7f..17e1207324ea 100644 --- a/scaladoc/src/dotty/tools/scaladoc/api.scala +++ b/scaladoc/src/dotty/tools/scaladoc/api.scala @@ -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) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala index a63cf3ad3775..2e58af5c3da9 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala @@ -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) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index f618492e15f8..8a2d60036e6c 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -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 diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index 40d6016359e4..3076b084ff07 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -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()) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala index 12738943c1fe..14b6c120b5b3 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala @@ -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) diff --git a/tests/run/productElementName.check b/tests/run/productElementName.check index a7499b7c1e5d..6bad7ad80814 100644 --- a/tests/run/productElementName.check +++ b/tests/run/productElementName.check @@ -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) diff --git a/tests/run/productElementName.scala b/tests/run/productElementName.scala index b98ac96cdfa9..ff9a2e4dac33 100644 --- a/tests/run/productElementName.scala +++ b/tests/run/productElementName.scala @@ -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