From cde98e67a407bfd89b5b930b81a3099df0673e3f Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Sat, 11 Aug 2018 11:21:40 +0200 Subject: [PATCH 1/2] Fix typos from #4926 --- .../src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 6 +++--- compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index f1d0e4bca752..606c8207cee8 100644 --- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -265,7 +265,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma } else { // println(i"not an enum: ${t.symbol} / ${t.symbol.denot.owner} / ${t.symbol.denot.owner.isTerm} / ${t.symbol.denot.owner.flags}") assert(toDenot(t.symbol).name.is(DefaultGetterName), - s"${toDenot(t.symbol).name.debugString}") // this should be default getter. do not emmit. + s"${toDenot(t.symbol).name.debugString}") // this should be default getter. do not emit. } case t: SeqLiteral => val arrAnnotV: AnnotationVisitor = av.visitArray(name) @@ -626,7 +626,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma def symbol: Symbol = a.tree.symbol - def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emmitted + def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emitted } def assocsFromApply(tree: Tree): List[(Name, Tree)] = { @@ -986,7 +986,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma def summaryString: String = tp.showSummary def params: List[Symbol] = - Nil // backend uses this to emmit annotations on parameter lists of forwarders + Nil // backend uses this to emit annotations on parameter lists of forwarders // to static methods of companion class // in Dotty this link does not exists: there is no way to get from method type // to inner symbols of DefDef diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala index cd5344c6ba19..b9b9d2821b71 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala @@ -274,7 +274,7 @@ object TastyFormat { final val OBJECTCLASS = 23 // The name of an object class (or: module class) `$`. - final val SIGNED = 63 // A pair of a name and a signature, used to idenitify + final val SIGNED = 63 // A pair of a name and a signature, used to identify // possibly overloaded methods. } object NameTags extends NameTags From eb3760b53d14ef0eddf785bbf6714b79504b7c3f Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Sat, 11 Aug 2018 12:29:45 +0200 Subject: [PATCH 2/2] More typos found by misspell Install https://github.com/client9/misspell, run ``` git ls-files '*.scala'|egrep -v 'scala2-library|scala-backend|collection-strawman'|xargs misspell ``` and review output. --- doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala | 2 +- tests/pos/sams.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala b/doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala index cd8ef835e466..5d2d3230d40d 100644 --- a/doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala +++ b/doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala @@ -16,7 +16,7 @@ import model._ trait MemberLookup { /** Performs a lookup based on the provided (pruned) query string * - * Will return a `Tooltip` if unsucessful, otherwise a LinkToEntity or + * Will return a `Tooltip` if unsuccessful, otherwise a LinkToEntity or * LinkToExternal */ def lookup(entity: Entity, packages: Map[String, Package], query: String): Option[Entity] = { diff --git a/tests/pos/sams.scala b/tests/pos/sams.scala index 20338b95c9bd..e18ff81ec805 100644 --- a/tests/pos/sams.scala +++ b/tests/pos/sams.scala @@ -69,7 +69,7 @@ object test { // synthesizeSAMFunction where the sam type is not fully defined class T { trait F[T, U] { def apply(x: T): U } - // this is an inner trait, that will recieve an abstract $outer pointer. Not a SAM. + // this is an inner trait, that will receive an abstract $outer pointer. Not a SAM. def app[T, U](x: T)(f: F[T, U]): U = f(x) app(1)(x => List(x)) }