diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index a94ba1f..71a6e4a 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.1.2 fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6 + +# Scala Steward: Reformat with scalafmt 3.1.2 +624bc98810f9caed05c63c2b0354a49f6db47a87 diff --git a/.scalafmt.conf b/.scalafmt.conf index 2da6138..851d264 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala3 -version = "3.1.1" +version = "3.1.2" maxColumn = 80 diff --git a/js/src/main/scala/com/thoughtworks/todo/Main.scala b/js/src/main/scala/com/thoughtworks/todo/Main.scala index ea81056..7aba0f3 100644 --- a/js/src/main/scala/com/thoughtworks/todo/Main.scala +++ b/js/src/main/scala/com/thoughtworks/todo/Main.scala @@ -20,8 +20,10 @@ import upickle.default.* object Models { val LocalStorageName = "todos-binding.scala" - def load() = Option(window.localStorage.getItem(LocalStorageName)).toSeq.flatMap(read[Seq[Todo]](_)) - def save(todos: collection.Seq[Todo]) = window.localStorage.setItem(LocalStorageName, write(todos)) + def load() = Option(window.localStorage.getItem(LocalStorageName)).toSeq + .flatMap(read[Seq[Todo]](_)) + def save(todos: collection.Seq[Todo]) = + window.localStorage.setItem(LocalStorageName, write(todos)) val allTodos = Vars[Todo](load(): _*) @@ -31,8 +33,16 @@ import upickle.default.* val editingTodo = Var[Option[Todo]](None) val all = TodoList("All", "#/", allTodos) - val active = TodoList("Active", "#/active", for (todo <- allTodos if !todo.completed) yield todo) - val completed = TodoList("Completed", "#/completed", for (todo <- allTodos if todo.completed) yield todo) + val active = TodoList( + "Active", + "#/active", + for (todo <- allTodos if !todo.completed) yield todo + ) + val completed = TodoList( + "Completed", + "#/completed", + for (todo <- allTodos if todo.completed) yield todo + ) val todoLists = Vector(all, active, completed) val route = Binding { LatestEvent.hashchange(window).bind @@ -71,7 +81,8 @@ import upickle.default.* case "" => allTodos.value.remove(allTodos.value.indexWhere(todo.eq)) case trimmedTitle => - allTodos.value(allTodos.value.indexWhere(todo.eq)) = Todo(trimmedTitle, todo.completed) + allTodos.value(allTodos.value.indexWhere(todo.eq)) = + Todo(trimmedTitle, todo.completed) } } def keyDownHandler(event: KeyboardEvent) = { @@ -84,16 +95,26 @@ import upickle.default.* case _ => } } - def blurHandler = Binding[Event => Any] { if (suppressOnBlur.bind) Function.const(()) else submit } + def blurHandler = Binding[Event => Any] { + if (suppressOnBlur.bind) Function.const(()) else submit + } def toggleHandler(event: Event) = { - allTodos.value(allTodos.value.indexWhere(todo.eq)) = Todo(todo.title, event.currentTarget.asInstanceOf[HTMLInputElement].checked) + allTodos.value(allTodos.value.indexWhere(todo.eq)) = Todo( + todo.title, + event.currentTarget.asInstanceOf[HTMLInputElement].checked + ) } - val editInput = html"""""" - html"""
  • + val editInput = + html"""""" + html"""
  • - - + +
    ${editInput}
  • """ @@ -102,35 +123,52 @@ import upickle.default.* def mainSection: Binding[Node] = { def toggleAllClickHandler(event: Event) = { for ((todo, i) <- allTodos.value.zipWithIndex) { - if (todo.completed != event.currentTarget.asInstanceOf[HTMLInputElement].checked) { - allTodos.value(i) = Todo(todo.title, event.currentTarget.asInstanceOf[HTMLInputElement].checked) + if ( + todo.completed != event.currentTarget + .asInstanceOf[HTMLInputElement] + .checked + ) { + allTodos.value(i) = Todo( + todo.title, + event.currentTarget.asInstanceOf[HTMLInputElement].checked + ) } } } - html"""
    + html"""
    - +
    """ } def footer: Binding[Node] = { def clearCompletedClickHandler(event: MouseEvent) = { - allTodos.value --= (for (todo <- allTodos.value if todo.completed) yield todo) + allTodos.value --= (for (todo <- allTodos.value if todo.completed) + yield todo) } - html"""