Skip to content

Commit 65275be

Browse files
authored
Merge pull request scalameta#1251 from seratch/fix-typos
Fix the typos detected by github.com/client9/misspell
2 parents 1666c0e + 2374327 commit 65275be

File tree

12 files changed

+19
-19
lines changed

12 files changed

+19
-19
lines changed

readme/Changelog07.scalatex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@li
2929
cached downloads of shared dependencies between version upgrades (saving 5-10mb per upgrade)
3030
@li
31-
custom JVM options for generated exectuable
31+
custom JVM options for generated executable
3232
@li
3333
ability to generate slim 16kb bootstrap script by removing `--standalone`,
3434
which can be committed to git/VCS

scalafmt-benchmarks/src/resources/scala-js/Semantics.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ final class Semantics private (
8181
}
8282

8383
/** Retrieve a list of semantics which are set to compliant */
84-
def compliants: List[String] = {
84+
def complaints: List[String] = {
8585
def cl(name: String, cond: Boolean) = if (cond) List(name) else Nil
8686

8787
cl("asInstanceOfs", asInstanceOfs == CheckedBehavior.Compliant) ++

scalafmt-cli/src/main/scala/org/scalafmt/cli/CliArgParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ object CliArgParser {
7878
AbsoluteFile.fromFiles(files, c.common.workingDirectory))
7979
}
8080
.hidden() // this option isn't needed anymore. Simply pass the files as
81-
// arguments. Keeping for backwards compatability
81+
// arguments. Keeping for backwards compatibility
8282
.text("file or directory, in which case all *.scala files are formatted. Deprecated: pass files as arguments")
8383

8484
opt[Unit]('i', "in-place")
8585
.action((opt, c) => c.copy(writeMode = Override))
8686
.hidden() // this option isn't needed anymore. Simply don't pass
87-
// --stdout. Keeping for backwards compatability
87+
// --stdout. Keeping for backwards compatibility
8888
.text("format files in-place (default)")
8989

9090
opt[Unit]("stdout")

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ object ScalafmtConfig {
280280
optIn = default.optIn.copy(
281281
breakChainOnFirstMethodDot = false
282282
),
283-
// The new agressive config style breaks ~40 unit tests. The diff output
283+
// The new aggressive config style breaks ~40 unit tests. The diff output
284284
// looks nice, but updating the unit tests would take too much time.
285285
// I can imagine that I will throw away most of the tests and replace them
286286
// with autogenerated tests from scala-repos.

scalafmt-core/shared/src/main/scala/org/scalafmt/config/Spaces.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.scalafmt.config.SpaceBeforeContextBound.Never
1414
* @param neverAroundInfixTypes
1515
* If ["##"] is specified as operator then
1616
* formats `Generic[Foo] ## Repr` as `Generic[Foo]##Repr`.
17-
* @param afterKeywordBeforeParen if false, does not add a space betwen a keyword and a parenthesis.
17+
* @param afterKeywordBeforeParen if false, does not add a space between a keyword and a parenthesis.
1818
* For example:
1919
* if(a) println("HELLO!")
2020
* while(a) println("HELLO!")

scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ object TreeOps {
259259
}
260260

261261
/**
262-
* Returns `true` if the [[Tree]] is a defintion site
262+
* Returns `true` if the [[Tree]] is a definition site
263263
*
264264
* Currently, this includes everything from classes and defs to type
265265
* applications

scalafmt-tests/src/test/resources/default/Trait.stat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ trait AllSyntax
5858
trait Grouped[K, +V]
5959
extends KeyedListLike[K, V, UnsortedGrouped]
6060
with HashJoinable[K, V]
61-
with Sortable[V, ({ type t[+x] = SortedGrouped[K, x] with Reversable[SortedGrouped[K, x]] })#t]
61+
with Sortable[V, ({ type t[+x] = SortedGrouped[K, x] with Reversible[SortedGrouped[K, x]] })#t]
6262
with WithReducers[Grouped[K, V]]
6363
with WithDescription[Grouped[K, V]]
6464
>>>
@@ -68,7 +68,7 @@ trait Grouped[K, +V]
6868
with Sortable[V,
6969
({
7070
type t[+x] =
71-
SortedGrouped[K, x] with Reversable[SortedGrouped[K, x]]
71+
SortedGrouped[K, x] with Reversible[SortedGrouped[K, x]]
7272
})#t]
7373
with WithReducers[Grouped[K, V]]
7474
with WithDescription[Grouped[K, V]]

scalafmt-tests/src/test/resources/vertical-multiline/afterImplicitKW.stat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ def format_![T <: Tree](
2020
): String
2121

2222
<<< should add a newline after implicit keyword in class definitions
23-
final class UserProfile(name: String, age: Int, address: Address, profession: Profesion, school: School)(
23+
final class UserProfile(name: String, age: Int, address: Address, profession: Profession, school: School)(
2424
implicit ctx: Context, ec: Executor)
2525
extends Profile with UserSettings with SomethingElse
2626
>>>
2727
final class UserProfile(
2828
name: String,
2929
age: Int,
3030
address: Address,
31-
profession: Profesion,
31+
profession: Profession,
3232
school: School
3333
)(implicit
3434
ctx: Context,

scalafmt-tests/src/test/resources/vertical-multiline/beforeImplicitKW.stat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ def format_![T <: Tree](
2222
): String
2323

2424
<<< should add a newline after implicit keyword in class definitions
25-
final class UserProfile(name: String, age: Int, address: Address, profession: Profesion, school: School)(
25+
final class UserProfile(name: String, age: Int, address: Address, profession: Profession, school: School)(
2626
implicit ctx: Context, ec: Executor)
2727
extends Profile with UserSettings with SomethingElse
2828
>>>
2929
final class UserProfile(
3030
name: String,
3131
age: Int,
3232
address: Address,
33-
profession: Profesion,
33+
profession: Profession,
3434
school: School
3535
)(
3636
implicit

scalafmt-tests/src/test/resources/vertical-multiline/verticalMultiline.stat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ def format_![T <: Tree](
105105
): String
106106

107107
<<< should affect classes
108-
final class UserProfile(name: String, age: Int, address: Address, profession: Profesion, school: School)(
108+
final class UserProfile(name: String, age: Int, address: Address, profession: Profession, school: School)(
109109
implicit ctx: Context, ec: Executor)
110110
extends Profile with UserSettings with SomethingElse
111111
>>>
112112
final class UserProfile(
113113
name: String,
114114
age: Int,
115115
address: Address,
116-
profession: Profesion,
116+
profession: Profession,
117117
school: School
118118
)(implicit ctx: Context,
119119
ec: Executor)

scalafmt-tests/src/test/scala/org/scalafmt/stats/OsInfo.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalafmt.stats
22

3-
case class OsInfo(name: String, architechture: String, version: String)
3+
case class OsInfo(name: String, architecture: String, version: String)
44

55
object OsInfo {
66

scalafmt-tests/src/test/scala/org/scalafmt/util/GitOpsTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class GitOpsTest extends fixture.FunSuite {
8181
ls should contain only (f)
8282
}
8383

84-
test("lsTree should not return commited files that have been deleted") {
84+
test("lsTree should not return committed files that have been deleted") {
8585
implicit ops =>
8686
val f = touch()
8787
add(f)
@@ -104,7 +104,7 @@ class GitOpsTest extends fixture.FunSuite {
104104
ls(innerGitOps) should contain only f2
105105
}
106106

107-
test("lsTree should return commited files that have been modified") {
107+
test("lsTree should return committed files that have been modified") {
108108
implicit ops =>
109109
val f = touch()
110110
add(f)
@@ -117,7 +117,7 @@ class GitOpsTest extends fixture.FunSuite {
117117
ops.diff(br)
118118

119119
// diff
120-
test("diff should return modified commited files") { implicit o =>
120+
test("diff should return modified committed files") { implicit o =>
121121
val f = touch()
122122
add(f)
123123
commit

0 commit comments

Comments
 (0)