From 097e45dd70e24d0d506bcacedd36fc326a8ce0f2 Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Wed, 27 Mar 2024 10:24:38 +0100 Subject: [PATCH] Add -xsource:3 --- .../alert/DismissibleUdashAlert.scala | 6 ++--- .../udash/bootstrap/button/UdashButton.scala | 13 ++++++----- .../datepicker/UdashDatePicker.scala | 14 +++++------- .../io/udash/bootstrap/form/UdashForm.scala | 4 ++-- .../io/udash/bootstrap/form/Validator.scala | 2 +- .../bootstrap/tooltip/UdashPopover.scala | 2 +- .../bootstrap/tooltip/UdashTooltip.scala | 2 +- .../utils/UdashBootstrapComponent.scala | 5 +++-- .../bootstrap/button/UdashButtonTest.scala | 7 +++--- .../datepicker/UdashDatePickerTest.scala | 10 ++++----- build.sbt | 1 + .../src/main/scala/io/udash/Application.scala | 2 +- .../scala/io/udash/bindings/Bindings.scala | 4 ++-- .../bindings/inputs/TextInputsModifier.scala | 22 +++++++++---------- .../io/udash/component/ComponentId.scala | 3 +-- .../io/udash/bindings/TagsBindingTest.scala | 2 +- .../udash/web/commons/components/Footer.scala | 8 ++++--- .../web/commons/views/MarkdownView.scala | 10 ++++----- .../udash/web/guide/views/ContentView.scala | 8 +++---- .../io/udash/web/guide/views/RootView.scala | 5 +++-- .../udash/web/guide/views/ViewContainer.scala | 3 --- .../bootstrapping/BootstrappingView.scala | 7 +++--- .../ext/demo/bootstrap/ButtonsDemo.scala | 20 ++++++++--------- .../guide/views/frontend/FrontendView.scala | 6 ++--- .../views/frontend/demos/IntroFormDemo.scala | 6 ++--- .../udash/web/guide/views/rpc/RpcView.scala | 8 +++---- .../homepage/components/demo/CodeDemo.scala | 4 ++-- .../styles/components/FooterStyles.scala | 3 --- .../styles/components/MobileMenuStyles.scala | 4 ---- .../commons/styles/utils/MediaQueries.scala | 3 --- .../guide/styles/partials/HeaderStyles.scala | 3 --- .../web/guide/styles/utils/MediaQueries.scala | 3 --- .../io/udash/rest/raw/RestMetadata.scala | 4 ++-- 33 files changed, 94 insertions(+), 110 deletions(-) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala index f1207332c..7055e8d95 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/alert/DismissibleUdashAlert.scala @@ -1,17 +1,17 @@ package io.udash.bootstrap package alert -import io.udash._ +import io.udash.* import io.udash.bindings.modifiers.Binding import io.udash.bootstrap.button.{UdashButton, UdashButtonOptions} import io.udash.bootstrap.utils.{BootstrapStyles, BootstrapTags} import org.scalajs.dom.Element -import scalatags.JsDom.all._ +import scalatags.JsDom.all.* +import com.avsystem.commons.SharedExtensions.universalOps final class DismissibleUdashAlert private[alert]( alertStyle: ReadableProperty[BootstrapStyles.Color], override val componentId: ComponentId )(content: Binding.NestedInterceptor => Modifier) extends UdashAlertBase(alertStyle, componentId) { - import io.udash.css.CssView._ private val _dismissed = Property[Boolean](false) diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala index 2f27c657e..c5fd8b63e 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/button/UdashButton.scala @@ -1,17 +1,18 @@ package io.udash.bootstrap package button +import io.udash.* import com.avsystem.commons.Opt -import com.avsystem.commons.misc.{AbstractCase, AbstractNamedEnumCompanion, AbstractValueEnum, AbstractValueEnumCompanion, EnumCtx, NamedEnum, SealedEnumCompanion} -import io.udash._ +import com.avsystem.commons.misc.AbstractCase import io.udash.bindings.modifiers.Binding import io.udash.bootstrap.button.UdashButton.{ButtonClickEvent, ButtonTag, UdashButtonJQuery} -import io.udash.bootstrap.utils._ +import io.udash.bootstrap.utils.* import io.udash.wrappers.jquery.{JQuery, jQ} import org.scalajs.dom -import org.scalajs.dom._ +import org.scalajs.dom.* import scalatags.JsDom -import scalatags.JsDom.all._ +import scalatags.JsDom.all.* +import com.avsystem.commons.SharedExtensions.universalOps import scala.scalajs.js @@ -41,7 +42,7 @@ final class UdashButton private( options: UdashButtonOptions )(content: Binding.NestedInterceptor => Modifier) extends UdashBootstrapComponent with Listenable { - import io.udash.css.CssView._ + import io.udash.css.CssView.* override type EventType = ButtonClickEvent diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala index b56233eb7..c41ee0ae4 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/datepicker/UdashDatePicker.scala @@ -1,16 +1,15 @@ package io.udash.bootstrap package datepicker -import java.{util => ju} - -import com.avsystem.commons.SharedExtensions._ +import java.util as ju import com.avsystem.commons.misc.{AbstractCase, AbstractValueEnum, AbstractValueEnumCompanion, EnumCtx} -import io.udash._ +import com.avsystem.commons.SharedExtensions.* +import io.udash.* import io.udash.bootstrap.utils.UdashIcons.FontAwesome import io.udash.bootstrap.utils.{BootstrapStyles, BootstrapTags, UdashBootstrapComponent} import io.udash.css.{CssStyle, CssStyleName} import io.udash.logging.CrossLogging -import io.udash.wrappers.jquery._ +import io.udash.wrappers.jquery.* import org.scalajs.dom.{Element, document} import scala.scalajs.js @@ -24,9 +23,8 @@ final class UdashDatePicker private[datepicker]( override val componentId: ComponentId ) extends UdashBootstrapComponent with Listenable with CrossLogging { - import UdashDatePicker._ - import io.udash.css.CssView._ - import scalatags.JsDom.all._ + import UdashDatePicker.* + import scalatags.JsDom.all.* override type EventType = UdashDatePicker.DatePickerEvent diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala index 0e4d4d916..f10fe6c7b 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/UdashForm.scala @@ -40,7 +40,7 @@ final class UdashForm private( override val render: Form = form(formStyle)( - onsubmit :+= { _: Event => fire(new UdashForm.FormEvent(this, UdashForm.FormEvent.EventType.Submit)); true }, + onsubmit :+= { (_: Event) => fire(new UdashForm.FormEvent(this, UdashForm.FormEvent.EventType.Submit)); true }, content(new FormElementsFactory(nestedInterceptor, inputValidationTrigger, selectValidationTrigger, this)) ).render } @@ -792,7 +792,7 @@ final class FormElementsFactory( val validationResult = Property[Option[ValidationResult]](None) Seq( eventBasedModifiers(validationResult), - onblur :+= { _: Event => + onblur :+= { (_: Event) => startValidation(validationResult, triggerGroup = true) false } diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/Validator.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/Validator.scala index 355b874f5..6c8c70e8f 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/Validator.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/form/Validator.scala @@ -30,7 +30,7 @@ object Invalid { Invalid(error +: errors) def apply(error: String, errors: String*): Invalid[ValidationError] = - this ((error +: errors).map(DefaultValidationError)) + this ((error +: errors).map(DefaultValidationError.apply)) } trait Validator[-ArgumentType] { diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala index 04a62f0b5..3d237a0d8 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashPopover.scala @@ -46,7 +46,7 @@ object UdashPopover extends TooltipUtils[UdashPopover] { new UdashPopover(tp) } - override protected val defaultPlacement = Placement.Right + override protected val defaultPlacement: StaticPlacement = Placement.Right override protected val defaultTemplate: String = { import io.udash.css.CssView._ import scalatags.Text.all._ diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala index 9aaaa0d45..999ed1d38 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/tooltip/UdashTooltip.scala @@ -46,7 +46,7 @@ object UdashTooltip extends TooltipUtils[UdashTooltip] { new UdashTooltip(tp) } - override protected val defaultPlacement = Placement.Top + override protected val defaultPlacement: StaticPlacement = Placement.Top override protected val defaultTemplate: String = { import io.udash.css.CssView._ import scalatags.Text.all._ diff --git a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/utils/UdashBootstrapComponent.scala b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/utils/UdashBootstrapComponent.scala index fb179a385..5d0d903dc 100644 --- a/bootstrap4/.js/src/main/scala/io/udash/bootstrap/utils/UdashBootstrapComponent.scala +++ b/bootstrap4/.js/src/main/scala/io/udash/bootstrap/utils/UdashBootstrapComponent.scala @@ -2,11 +2,12 @@ package io.udash.bootstrap.utils import io.udash.bindings.modifiers.Binding import io.udash.component.Component -import io.udash.wrappers.jquery._ +import io.udash.css.CssView +import io.udash.wrappers.jquery.* import org.scalajs.dom.Element /** Base trait for Bootstrap components. */ -trait UdashBootstrapComponent extends Component { +trait UdashBootstrapComponent extends Component with CssView { override val render: Element protected class JQueryOnBinding(selector: JQuery, event: EventName, callback: JQueryCallback) extends Binding { diff --git a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/button/UdashButtonTest.scala b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/button/UdashButtonTest.scala index d3480f482..55116c0b3 100644 --- a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/button/UdashButtonTest.scala +++ b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/button/UdashButtonTest.scala @@ -1,10 +1,11 @@ package io.udash.bootstrap.button -import io.udash._ -import io.udash.bootstrap._ +import io.udash.* +import io.udash.bootstrap.* import io.udash.bootstrap.utils.BootstrapStyles import io.udash.testing.UdashCoreFrontendTest -import io.udash.wrappers.jquery._ +import io.udash.wrappers.jquery.* +import com.avsystem.commons.SharedExtensions.* class UdashButtonTest extends UdashCoreFrontendTest { diff --git a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/datepicker/UdashDatePickerTest.scala b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/datepicker/UdashDatePickerTest.scala index bfb0643c5..c74a45881 100644 --- a/bootstrap4/.js/src/test/scala/io/udash/bootstrap/datepicker/UdashDatePickerTest.scala +++ b/bootstrap4/.js/src/test/scala/io/udash/bootstrap/datepicker/UdashDatePickerTest.scala @@ -1,18 +1,18 @@ package io.udash.bootstrap package datepicker -import java.{util => ju} +import java.util as ju -import com.avsystem.commons._ -import io.udash._ +import io.udash.* import io.udash.bootstrap.datepicker.UdashDatePickerTest.JQueryDatePickerExt import io.udash.bootstrap.form.UdashInputGroup import io.udash.bootstrap.utils.UdashIcons.FontAwesome import io.udash.i18n.{Bundle, BundleHash, Lang, LocalTranslationProvider, TranslationKey} import io.udash.testing.AsyncUdashCoreFrontendTest -import io.udash.wrappers.jquery._ +import io.udash.wrappers.jquery.* import org.scalajs.dom -import scalatags.JsDom.all._ +import scalatags.JsDom.all.* +import com.avsystem.commons.SharedExtensions.* import scala.concurrent.Future import scala.scalajs.js diff --git a/build.sbt b/build.sbt index 0c982301f..0ad276d97 100644 --- a/build.sbt +++ b/build.sbt @@ -71,6 +71,7 @@ val commonSettings = Seq( "-language:experimental.macros", "-Xfatal-warnings", "-Xlint:_,-missing-interpolator,-unused", + "-Xsource:3", "-Yrangepos", "-Ybackend-parallelism", "8", "-Ycache-plugin-class-loader:last-modified", diff --git a/core/.js/src/main/scala/io/udash/Application.scala b/core/.js/src/main/scala/io/udash/Application.scala index 4b7e4bc44..ee4eb452f 100644 --- a/core/.js/src/main/scala/io/udash/Application.scala +++ b/core/.js/src/main/scala/io/udash/Application.scala @@ -61,7 +61,7 @@ class Application[HierarchyRoot >: Null <: GState[HierarchyRoot] : PropertyCreat onApplicationStarted(rootElement) } if (dom.document.readyState != DocumentReadyState.loading) onReady() - else dom.document.addEventListener("DOMContentLoaded", { _: Event => onReady() }, new EventListenerOptions { + else dom.document.addEventListener("DOMContentLoaded", { (_: Event) => onReady() }, new EventListenerOptions { once = true passive = true }) diff --git a/core/.js/src/main/scala/io/udash/bindings/Bindings.scala b/core/.js/src/main/scala/io/udash/bindings/Bindings.scala index d1945d629..6516295ac 100644 --- a/core/.js/src/main/scala/io/udash/bindings/Bindings.scala +++ b/core/.js/src/main/scala/io/udash/bindings/Bindings.scala @@ -375,9 +375,9 @@ object Bindings extends Bindings { val dyn: js.Dynamic = el.asInstanceOf[js.Dynamic] val existingCallbacks: js.Function1[T, Boolean] = dyn.selectDynamic(attr.name).asInstanceOf[js.Function1[T, Boolean]] if (existingCallbacks == null) - dyn.updateDynamic(attr.name) { e: T => if (callback(e) == true) e.preventDefault() } + dyn.updateDynamic(attr.name) { (e: T) => if (callback(e) == true) e.preventDefault() } else - dyn.updateDynamic(attr.name) { e: T => + dyn.updateDynamic(attr.name) { (e: T) => val preventDefault = callback(e) if (preventDefault == true) e.preventDefault() else existingCallbacks(e) diff --git a/core/.js/src/main/scala/io/udash/bindings/inputs/TextInputsModifier.scala b/core/.js/src/main/scala/io/udash/bindings/inputs/TextInputsModifier.scala index 7ad1bd492..1991a2e36 100644 --- a/core/.js/src/main/scala/io/udash/bindings/inputs/TextInputsModifier.scala +++ b/core/.js/src/main/scala/io/udash/bindings/inputs/TextInputsModifier.scala @@ -32,18 +32,16 @@ private[bindings] abstract class TextInputsModifier(property: Property[String], } var propertyUpdateHandler: Int = 0 - val callback = if (debounce.toMillis > 0) { - _: Event => { - if (propertyUpdateHandler != 0) window.clearTimeout(propertyUpdateHandler) - propertyUpdateHandler = window.setTimeout(() => { - updatePropertyValueForElement(t) - }, debounce.toMillis.toDouble) - } - } else { - _: Event => { - updatePropertyValueForElement(t) - } - } + val callback = + if (debounce.toMillis > 0) + (_: Event) => { + if (propertyUpdateHandler != 0) window.clearTimeout(propertyUpdateHandler) + propertyUpdateHandler = window.setTimeout(() => { + updatePropertyValueForElement(t) + }, debounce.toMillis.toDouble) + } + else + (_: Event) => updatePropertyValueForElement(t) setElementKeyUp(t, callback) setElementOnChange(t, callback) setElementOnInput(t, callback) diff --git a/core/.js/src/main/scala/io/udash/component/ComponentId.scala b/core/.js/src/main/scala/io/udash/component/ComponentId.scala index dc44b9ff1..8e636ced6 100644 --- a/core/.js/src/main/scala/io/udash/component/ComponentId.scala +++ b/core/.js/src/main/scala/io/udash/component/ComponentId.scala @@ -6,8 +6,7 @@ import org.scalajs.dom.Element import scalatags.JsDom.GenericAttr import scalatags.JsDom.all._ - -final case class ComponentId private(value: String) extends AbstractCase with Modifier { +final case class ComponentId(value: String) extends AbstractCase with Modifier { override def applyTo(t: Element): Unit = { t.id = value } diff --git a/core/.js/src/test/scala/io/udash/bindings/TagsBindingTest.scala b/core/.js/src/test/scala/io/udash/bindings/TagsBindingTest.scala index 61b9b2cd1..fe421d020 100644 --- a/core/.js/src/test/scala/io/udash/bindings/TagsBindingTest.scala +++ b/core/.js/src/test/scala/io/udash/bindings/TagsBindingTest.scala @@ -626,7 +626,7 @@ class TagsBindingTest extends UdashFrontendTest with Bindings { bindings: Bindin p.set(new Model.WithSubTrait { override def i = 5 - override def subType = new Model.SubTrait { + override def subType: Model.SubTrait = new Model.SubTrait { override def i = 7 } }) diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala index e599db218..d9e1dcda3 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/components/Footer.scala @@ -1,6 +1,7 @@ package io.udash.web.commons.components -import com.avsystem.commons._ +import com.avsystem.commons.Opt +import io.udash.* import io.udash.css.CssStyle import io.udash.web.commons.config.ExternalUrls import io.udash.web.commons.styles.GlobalStyles @@ -8,10 +9,11 @@ import io.udash.web.commons.styles.components.FooterStyles import io.udash.web.commons.views.Image import org.scalajs.dom.html.Element import scalatags.JsDom -import scalatags.JsDom.all._ +import scalatags.JsDom.all.* object Footer { - import io.udash.css.CssView._ + + import io.udash.css.CssView.* private val styles = FooterStyles private def template(wrapperStyle: Opt[CssStyle]): JsDom.TypedTag[Element] = footer(styles.footer)( diff --git a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala index 0ae877f1d..cefdcb945 100644 --- a/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala +++ b/guide/commons/.js/src/main/scala/io/udash/web/commons/views/MarkdownView.scala @@ -1,13 +1,13 @@ package io.udash.web.commons.views -import com.avsystem.commons._ -import com.avsystem.commons.misc.AbstractCase -import io.udash._ -import io.udash.bootstrap._ +import com.avsystem.commons.misc.{AbstractCase, Opt} +import io.udash.* +import io.udash.bootstrap.* import io.udash.bootstrap.alert.UdashAlert import io.udash.web.guide.markdown.{MarkdownPage, MarkdownPageRPC} import io.udash.web.guide.styles.MarkdownStyles import org.scalajs.dom +import com.avsystem.commons.SharedExtensions.* import scala.util.{Failure, Success} @@ -67,7 +67,7 @@ final class MarkdownView(model: ReadableModelProperty[MarkdownModel]) extends Vi import io.udash.css.CssView._ import scalatags.JsDom.all._ - override val getTemplate: Modifier = ISeq( + override val getTemplate: Modifier = Seq( produce(model.roSubProp(_.error)) { error => error.opt.filter(_.nonEmpty).map(e => div(cls := "bootstrap")( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala index 49596951c..c36fdc0be 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ContentView.scala @@ -1,12 +1,12 @@ package io.udash.web.guide.views -import io.udash._ +import io.udash.* import io.udash.web.commons.styles.GlobalStyles import io.udash.web.guide.ContentState import io.udash.web.guide.components.GuideMenu import io.udash.web.guide.styles.partials.GuideStyles - -import scalatags.JsDom.tags2._ +import org.scalajs.dom.Element +import scalatags.JsDom.tags2.* object ContentViewFactory extends StaticViewFactory[ContentState.type](() => new ContentView) @@ -15,7 +15,7 @@ class ContentView extends ViewContainer { import scalatags.JsDom.all._ - protected val child = main(GuideStyles.contentWrapper).render + override protected val child: Element = main(GuideStyles.contentWrapper).render private val content = main(GuideStyles.main)( div(GlobalStyles.body)( diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/RootView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/RootView.scala index 1fdd49045..c3c77faea 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/RootView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/RootView.scala @@ -1,16 +1,17 @@ package io.udash.web.guide.views -import io.udash._ +import io.udash.* import io.udash.web.commons.components.Footer import io.udash.web.guide.RootState import io.udash.web.guide.components.Header +import org.scalajs.dom.Element object RootViewFactory extends StaticViewFactory[RootState.type](() => new RootView) class RootView extends ViewContainer { import scalatags.JsDom.all._ - protected val child = div().render + override protected val child: Element = div().render private val content = div( Header.getTemplate, diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ViewContainer.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ViewContainer.scala index 386fb4dec..1e6d814e3 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ViewContainer.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ViewContainer.scala @@ -6,9 +6,6 @@ import org.scalajs.dom._ import scala.scalajs.js -/** - * Created by malchik on 2016-03-30. - */ abstract class ViewContainer extends ContainerView { protected val child: Element diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingView.scala index fe8cd7275..7b665a1f7 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/bootstrapping/BootstrappingView.scala @@ -1,8 +1,9 @@ package io.udash.web.guide.views.bootstrapping -import io.udash._ +import io.udash.* import io.udash.web.guide.views.ViewContainer -import io.udash.web.guide.{Context, _} +import io.udash.web.guide.{Context, *} +import org.scalajs.dom.Element import scalatags.JsDom case object BootstrappingViewFactory extends StaticViewFactory[BootstrappingState.type](() => new BootstrappingView) @@ -11,7 +12,7 @@ class BootstrappingView extends ViewContainer { import Context._ import JsDom.all._ - protected val child = div().render + override protected val child: Element = div().render override def getTemplate: Modifier = div( h1("Application bootstrapping"), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala index 858c324f1..9f37cf3fa 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/ext/demo/bootstrap/ButtonsDemo.scala @@ -1,21 +1,21 @@ package io.udash.web.guide.views.ext.demo.bootstrap - import io.udash.bootstrap.button.UdashButtonOptions import io.udash.web.guide.demos.AutoDemo import io.udash.web.guide.styles.partials.GuideStyles -import scalatags.JsDom.all._ +import org.scalajs.dom.Element +import scalatags.JsDom.all.* object ButtonsDemo extends AutoDemo { - private val (rendered, source) = { - import io.udash._ - import io.udash.bootstrap._ - import BootstrapStyles._ + private val (rendered: Element, source: String) = { + import io.udash.* + import io.udash.bootstrap.* + import io.udash.bootstrap.utils.BootstrapStyles.* import io.udash.bootstrap.button.UdashButton import io.udash.css.CssStyle - import io.udash.css.CssView._ - import scalatags.JsDom.all._ + import io.udash.css.CssView.* + import scalatags.JsDom.all.* import scala.util.Random @@ -28,7 +28,7 @@ object ButtonsDemo extends AutoDemo { ) } - val buttons = Color.values.map(color => + val buttons: Seq[UdashButton] = Color.values.map(color => UdashButton( options = UdashButtonOptions( color.opt, @@ -78,7 +78,7 @@ object ButtonsDemo extends AutoDemo { }.withSourceCode override protected def demoWithSource(): (Modifier, String) = { - import io.udash.css.CssView._ + import io.udash.css.CssView.* (rendered.setup(_.applyTags(GuideStyles.frame)), source) } } diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendView.scala index a89b9dd72..36a2446bc 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/FrontendView.scala @@ -1,9 +1,9 @@ package io.udash.web.guide.views.frontend -import io.udash._ +import io.udash.* import io.udash.web.guide.FrontendState import io.udash.web.guide.views.ViewContainer - +import org.scalajs.dom.Element import scalatags.JsDom case object FrontendViewFactory extends StaticViewFactory[FrontendState.type](() => new FrontendView) @@ -12,7 +12,7 @@ case object FrontendViewFactory extends StaticViewFactory[FrontendState.type](() class FrontendView extends ViewContainer { import JsDom.all._ - protected val child = div().render + override protected val child: Element = div().render override def getTemplate: Modifier = div( h1("Frontend"), diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala index 310650d08..5067fc6fe 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/frontend/demos/IntroFormDemo.scala @@ -30,7 +30,7 @@ object IntroFormDemo extends AutoDemo { object IntroFormDemoState extends State { override type HierarchyRoot = IntroFormDemoState.type - override def parentState = None + override def parentState: None.type = None } /** Prepares model, view and presenter for demo view. */ @@ -73,7 +73,7 @@ object IntroFormDemo extends AutoDemo { private val between = model.subProp(_.between).bitransform(i2s)(s2i) private val maximum = model.subProp(_.maximum).bitransform(i2s)(s2i) - private val validation = model.transform { element: IntroFormDemoModel => + private val validation = model.transform { (element: IntroFormDemoModel) => val errors = mutable.ArrayBuffer[String]() if (element.minimum > element.maximum) errors += "Minimum is bigger than maximum!" @@ -82,7 +82,7 @@ object IntroFormDemo extends AutoDemo { if (element.between > element.maximum) errors += "Maximum is smaller than your value!" if (errors.isEmpty) Valid - else Invalid(errors.map(DefaultValidationError).toSeq) + else Invalid(errors.map(DefaultValidationError.apply).toSeq) } // Button from Udash Bootstrap wrapper diff --git a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcView.scala b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcView.scala index bdd697011..79d84f961 100644 --- a/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcView.scala +++ b/guide/guide/.js/src/main/scala/io/udash/web/guide/views/rpc/RpcView.scala @@ -1,9 +1,9 @@ package io.udash.web.guide.views.rpc -import io.udash._ -import io.udash.web.guide._ +import io.udash.* +import io.udash.web.guide.* import io.udash.web.guide.views.ViewContainer - +import org.scalajs.dom.Element import scalatags.JsDom case object RpcViewFactory extends StaticViewFactory[RpcState.type](() => new RpcView) @@ -11,7 +11,7 @@ case object RpcViewFactory extends StaticViewFactory[RpcState.type](() => new Rp class RpcView extends ViewContainer { import JsDom.all._ - protected val child = div().render + override protected val child: Element = div().render override def getTemplate: Modifier = div( h1("RPC in Udash"), diff --git a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/demo/CodeDemo.scala b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/demo/CodeDemo.scala index 12ea00cea..bbfb97d09 100644 --- a/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/demo/CodeDemo.scala +++ b/guide/homepage/.js/src/main/scala/io/udash/web/homepage/components/demo/CodeDemo.scala @@ -10,7 +10,7 @@ trait CodeDemo { } object HelloDemo extends CodeDemo { - val (rendered, source) = { + val (rendered: Modifier, source) = { val name = Property.blank[String] div( TextInput(name)(), @@ -20,7 +20,7 @@ object HelloDemo extends CodeDemo { } object SelectDemo extends CodeDemo { - val (rendered, source) = { + val (rendered: Modifier, source) = { import com.avsystem.commons.misc.AutoNamedEnum sealed trait Fruit extends AutoNamedEnum diff --git a/guide/shared/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala b/guide/shared/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala index 6588f98b1..97a6f71eb 100644 --- a/guide/shared/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala +++ b/guide/shared/src/main/scala/io/udash/web/commons/styles/components/FooterStyles.scala @@ -6,9 +6,6 @@ import scalacss.internal.Literal import scala.language.postfixOps -/** - * Created by malchik on 2016-04-04. - */ object FooterStyles extends CssBase { import dsl._ diff --git a/guide/shared/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala b/guide/shared/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala index c1d4982cf..13d1b3df3 100644 --- a/guide/shared/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala +++ b/guide/shared/src/main/scala/io/udash/web/commons/styles/components/MobileMenuStyles.scala @@ -1,9 +1,5 @@ package io.udash.web.commons.styles.components -/** - * Created by malchik on 2016-07-01. - */ - import io.udash.css.{CssBase, CssStyle} import io.udash.web.commons.styles.attributes.Attributes import io.udash.web.commons.styles.utils.{CommonStyleUtils, MediaQueries, StyleConstants} diff --git a/guide/shared/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala b/guide/shared/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala index a51cd2dba..29ab4044c 100644 --- a/guide/shared/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala +++ b/guide/shared/src/main/scala/io/udash/web/commons/styles/utils/MediaQueries.scala @@ -5,9 +5,6 @@ import scalacss.internal.DslBase.ToStyle import scala.language.postfixOps -/** - * Created by malchik on 2016-03-30. - */ object MediaQueries extends CssBase { import dsl._ diff --git a/guide/shared/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala b/guide/shared/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala index d9f071c75..8b11b8fac 100644 --- a/guide/shared/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala +++ b/guide/shared/src/main/scala/io/udash/web/guide/styles/partials/HeaderStyles.scala @@ -7,9 +7,6 @@ import io.udash.web.guide.styles.utils.{GuideStyleUtils, MediaQueries} import scala.language.postfixOps -/** - * Created by malchik on 2016-04-04. - */ object HeaderStyles extends CssBase with HeaderButtonsStyles with HeaderNavStyles { import dsl._ diff --git a/guide/shared/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala b/guide/shared/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala index c37a3703d..aa4205f9b 100644 --- a/guide/shared/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala +++ b/guide/shared/src/main/scala/io/udash/web/guide/styles/utils/MediaQueries.scala @@ -6,9 +6,6 @@ import scalacss.internal.DslBase.ToStyle import scala.language.postfixOps -/** - * Created by malchik on 2016-03-30. - */ object MediaQueries extends CssBase { import dsl._ diff --git a/rest/src/main/scala/io/udash/rest/raw/RestMetadata.scala b/rest/src/main/scala/io/udash/rest/raw/RestMetadata.scala index 4ccb0135d..5151ad739 100644 --- a/rest/src/main/scala/io/udash/rest/raw/RestMetadata.scala +++ b/rest/src/main/scala/io/udash/rest/raw/RestMetadata.scala @@ -235,8 +235,8 @@ sealed abstract class RestMethodMetadata[T] extends TypedMetadata[T] { def requestAdjusters: List[RequestAdjuster] def responseAdjusters: List[ResponseAdjuster] - val pathPattern: List[PathPatternElement] = methodPath.map(PathName) ++ - parametersMetadata.pathParams.flatMap(pp => PathParam(pp) :: pp.pathSuffix.map(PathName)) + val pathPattern: List[PathPatternElement] = methodPath.map(PathName.apply) ++ + parametersMetadata.pathParams.flatMap(pp => PathParam(pp) :: pp.pathSuffix.map(PathName.apply)) def applyPathParams(params: List[PlainValue]): List[PlainValue] = { def loop(params: List[PlainValue], pattern: List[PathPatternElement]): List[PlainValue] =