diff --git a/.scalafmt.conf b/.scalafmt.conf index 8bfe3cb6f..9893271de 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,6 +1,6 @@ version = 3.8.6 -runner.dialect = scala212 +runner.dialect = scala212source3 maxColumn = 100 @@ -26,3 +26,5 @@ spaces.inImportCurlyBraces=true spaces.afterSymbolicDefs=true binPack.parentConstructors = keep +rewrite.scala3.convertToNewSyntax = true +rewrite.scala3.newSyntax.control = false diff --git a/core/jvm/src/test/scala/laika/rst/ReStructuredTextToHTMLSpec.scala b/core/jvm/src/test/scala/laika/rst/ReStructuredTextToHTMLSpec.scala index c0f311c06..5d86fa782 100644 --- a/core/jvm/src/test/scala/laika/rst/ReStructuredTextToHTMLSpec.scala +++ b/core/jvm/src/test/scala/laika/rst/ReStructuredTextToHTMLSpec.scala @@ -108,7 +108,7 @@ class ReStructuredTextToHTMLSpec extends FunSuite { fmt.element( "a", sl.withStyles("reference", "external"), - fmt.optAttributes("href" -> Some(url), "title" -> title) * + fmt.optAttributes("href" -> Some(url), "title" -> title)* ) case it: InternalTarget => val relativePath = it.relativeTo(fmt.path).relativePath @@ -122,7 +122,7 @@ class ReStructuredTextToHTMLSpec extends FunSuite { fmt.optAttributes( "href" -> Some("#" + relativePath.fragment.get), "title" -> title - ) * + )* ) } diff --git a/core/shared/src/main/scala/laika/api/builder/TransformerBuilderOps.scala b/core/shared/src/main/scala/laika/api/builder/TransformerBuilderOps.scala index e21d03ff3..67910a1a0 100644 --- a/core/shared/src/main/scala/laika/api/builder/TransformerBuilderOps.scala +++ b/core/shared/src/main/scala/laika/api/builder/TransformerBuilderOps.scala @@ -18,7 +18,7 @@ package laika.api.builder import laika.api.bundle.ExtensionBundle import laika.ast.RewriteRules.{ RewritePhaseBuilder, RewriteRulesBuilder } -import laika.ast._ +import laika.ast.* /** API for specifying configuration options that apply to all * kinds of operations that contain both, a parsing and a rendering step (only Transform API). diff --git a/core/shared/src/main/scala/laika/api/bundle/ParserBuilder.scala b/core/shared/src/main/scala/laika/api/bundle/ParserBuilder.scala index fad53b4aa..105a1d3ea 100644 --- a/core/shared/src/main/scala/laika/api/bundle/ParserBuilder.scala +++ b/core/shared/src/main/scala/laika/api/bundle/ParserBuilder.scala @@ -23,7 +23,7 @@ import laika.parse.text.PrefixedParser /** Base trait for `SpanParserBuilder` and `BlockParserBuilder` APIs. */ -sealed trait ParserBuilder[T <: ParserDefinition[_]] { +sealed trait ParserBuilder[T <: ParserDefinition[?]] { /** Builds a block parser definition lazily by passing the recursive parsers * of the host language. @@ -105,7 +105,7 @@ class BlockParserBuilder private ( def createParser(recursiveParsers: RecursiveParsers): BlockParserDefinition = { val p = parserFactory(recursiveParsers) val startChars = p match { - case pp: PrefixedParser[_] => pp.startChars.toSortedSet + case pp: PrefixedParser[?] => pp.startChars.toSortedSet case _ => Set.empty[Char] } new BlockParserDefinition(startChars, p, recursive, position, precedence, paragraphLineCheck) diff --git a/core/shared/src/main/scala/laika/api/format/TagFormatter.scala b/core/shared/src/main/scala/laika/api/format/TagFormatter.scala index 34d837b31..b9258782e 100644 --- a/core/shared/src/main/scala/laika/api/format/TagFormatter.scala +++ b/core/shared/src/main/scala/laika/api/format/TagFormatter.scala @@ -51,7 +51,7 @@ abstract class TagFormatter extends Formatter { */ def element( tagName: String, - container: ElementContainer[_ <: Element], + container: ElementContainer[? <: Element], attrs: (String, String)* ): String = s"<$tagName${attributes(tagName, container, attrs)}>${children(container.content)}" @@ -61,7 +61,7 @@ abstract class TagFormatter extends Formatter { */ def indentedElement( tagName: String, - container: ElementContainer[_ <: Element], + container: ElementContainer[? <: Element], attrs: (String, String)* ): String = s"<$tagName${attributes(tagName, container, attrs)}>${ diff --git a/core/shared/src/main/scala/laika/ast/ElementTraversal.scala b/core/shared/src/main/scala/laika/ast/ElementTraversal.scala index 1c696f5fd..1b0cb8e41 100644 --- a/core/shared/src/main/scala/laika/ast/ElementTraversal.scala +++ b/core/shared/src/main/scala/laika/ast/ElementTraversal.scala @@ -37,10 +37,10 @@ trait ElementTraversal { this: Element => f(element) } - def foreachInIterable(t: Iterable[_], f: Element => Unit): Unit = { + def foreachInIterable(t: Iterable[?], f: Element => Unit): Unit = { t.foreach { case e: Element => foreachInElement(e, f) - case t: Iterable[_] => foreachInIterable(t, f) + case t: Iterable[?] => foreachInIterable(t, f) case _ => () } } diff --git a/core/shared/src/main/scala/laika/ast/OutputContext.scala b/core/shared/src/main/scala/laika/ast/OutputContext.scala index 75a4ac4a8..e1ec226db 100644 --- a/core/shared/src/main/scala/laika/ast/OutputContext.scala +++ b/core/shared/src/main/scala/laika/ast/OutputContext.scala @@ -45,9 +45,9 @@ object OutputContext { override def productPrefix: String = "OutputContext" } - def apply(format: RenderFormat[_]): OutputContext = + def apply(format: RenderFormat[?]): OutputContext = Impl(format.fileSuffix, format.description.toLowerCase) - def apply(format: TwoPhaseRenderFormat[_, _]): OutputContext = apply(format.interimFormat) + def apply(format: TwoPhaseRenderFormat[?, ?]): OutputContext = apply(format.interimFormat) } diff --git a/core/shared/src/main/scala/laika/ast/RewriteRules.scala b/core/shared/src/main/scala/laika/ast/RewriteRules.scala index 694c82ab4..b423c5b09 100644 --- a/core/shared/src/main/scala/laika/ast/RewriteRules.scala +++ b/core/shared/src/main/scala/laika/ast/RewriteRules.scala @@ -368,8 +368,8 @@ case object RewritePhase { case class Render(context: OutputContext) extends RewritePhase object Render { - def apply(format: RenderFormat[_]): Render = apply(OutputContext(format)) - def apply(format: TwoPhaseRenderFormat[_, _]): Render = apply(OutputContext(format)) + def apply(format: RenderFormat[?]): Render = apply(OutputContext(format)) + def apply(format: TwoPhaseRenderFormat[?, ?]): Render = apply(OutputContext(format)) } } diff --git a/core/shared/src/main/scala/laika/ast/documents.scala b/core/shared/src/main/scala/laika/ast/documents.scala index abc6f864a..22553aa46 100644 --- a/core/shared/src/main/scala/laika/ast/documents.scala +++ b/core/shared/src/main/scala/laika/ast/documents.scala @@ -137,7 +137,7 @@ case class StaticDocument(path: Path, formats: TargetFormats = TargetFormats.All object StaticDocument { def apply(path: Path, format: String, formats: String*): StaticDocument = - StaticDocument(path, TargetFormats.Selected(NonEmptySet.of(format, formats: _*))) + StaticDocument(path, TargetFormats.Selected(NonEmptySet.of(format, formats*))) } diff --git a/core/shared/src/main/scala/laika/config/Selections.scala b/core/shared/src/main/scala/laika/config/Selections.scala index cfe2abcb3..97dbd0d48 100644 --- a/core/shared/src/main/scala/laika/config/Selections.scala +++ b/core/shared/src/main/scala/laika/config/Selections.scala @@ -165,7 +165,7 @@ object Selections { } combinations.fold(NonEmptyChain.one(value))(_.map { combined => - Selections((combined.toChain.toList ++ nonSeparated) *) + Selections((combined.toChain.toList ++ nonSeparated)*) }) } diff --git a/core/shared/src/main/scala/laika/config/TargetFormats.scala b/core/shared/src/main/scala/laika/config/TargetFormats.scala index 7db335ba1..2804416c8 100644 --- a/core/shared/src/main/scala/laika/config/TargetFormats.scala +++ b/core/shared/src/main/scala/laika/config/TargetFormats.scala @@ -54,13 +54,13 @@ object TargetFormats { object Selected { def apply(format: String, formats: String*): Selected = apply( - NonEmptySet.of(format, formats *) + NonEmptySet.of(format, formats*) ) } implicit val decoder: ConfigDecoder[TargetFormats] = ConfigDecoder.seq[String].map { formats => - NonEmptySet.fromSet(TreeSet(formats *)).fold[TargetFormats](TargetFormats.None)(fs => + NonEmptySet.fromSet(TreeSet(formats*)).fold[TargetFormats](TargetFormats.None)(fs => if (fs == NonEmptySet.one("*")) TargetFormats.All else { val pdfExtra = if (fs.contains("pdf")) Seq("fo", "xsl-fo") else Nil diff --git a/core/shared/src/main/scala/laika/internal/directive/NavigationTreeDirectives.scala b/core/shared/src/main/scala/laika/internal/directive/NavigationTreeDirectives.scala index b3b5c826f..937e5619f 100644 --- a/core/shared/src/main/scala/laika/internal/directive/NavigationTreeDirectives.scala +++ b/core/shared/src/main/scala/laika/internal/directive/NavigationTreeDirectives.scala @@ -102,7 +102,7 @@ private[laika] object NavigationTreeDirectives { val noRoot = optExcludeRoot.getOrElse(excludeRoot) val context = NavigationBuilderContext.defaults .withRefPath(cursor.path) - .withItemStyles(itemStyles.toSeq *) + .withItemStyles(itemStyles.toSeq*) .withMaxLevels(depth.getOrElse(defaultDepth)) .withExcludeSections(optExcludeSections.getOrElse(excludeSections)) .withExcludeSelf(excludeSelf) diff --git a/core/shared/src/main/scala/laika/internal/directive/StandardDirectives.scala b/core/shared/src/main/scala/laika/internal/directive/StandardDirectives.scala index 8e2fe7ded..b585e06ba 100644 --- a/core/shared/src/main/scala/laika/internal/directive/StandardDirectives.scala +++ b/core/shared/src/main/scala/laika/internal/directive/StandardDirectives.scala @@ -187,7 +187,7 @@ private[laika] object StandardDirectives extends DirectiveRegistry { (positionalAttributes.as[String].widen, parsedBody.map(asBlock(_))).mapN { (formats, body) => NonEmptySet - .fromSet(TreeSet(formats: _*)) + .fromSet(TreeSet(formats*)) .fold[Either[String, Block]](Left("no formats provided"))(set => Right(TargetFormat(set, body)) ) @@ -199,7 +199,7 @@ private[laika] object StandardDirectives extends DirectiveRegistry { lazy val blockStyle: BlockDirectives.Directive = BlockDirectives.create("style") { import laika.api.bundle.BlockDirectives.dsl.* - (parsedBody, positionalAttributes.as[String].map(Styles(_: _*))).mapN(asBlock) + (parsedBody, positionalAttributes.as[String].map(Styles(_*))).mapN(asBlock) } /** Implementation of the `style` directive for span elements in markup documents. @@ -207,7 +207,7 @@ private[laika] object StandardDirectives extends DirectiveRegistry { lazy val spanStyle: SpanDirectives.Directive = SpanDirectives.create("style") { import laika.api.bundle.SpanDirectives.dsl.* - (parsedBody, positionalAttributes.as[String].map(Styles(_: _*))).mapN(asSpan) + (parsedBody, positionalAttributes.as[String].map(Styles(_*))).mapN(asSpan) } /** Implementation of the `icon` directive for span elements in markup documents. diff --git a/core/shared/src/main/scala/laika/internal/markdown/BlockParsers.scala b/core/shared/src/main/scala/laika/internal/markdown/BlockParsers.scala index 3694a76af..3d7488088 100644 --- a/core/shared/src/main/scala/laika/internal/markdown/BlockParsers.scala +++ b/core/shared/src/main/scala/laika/internal/markdown/BlockParsers.scala @@ -112,7 +112,7 @@ private[laika] object BlockParsers { def paragraph(firstLine: LineSource, restLines: Seq[LineSource]): Paragraph = Paragraph( recParsers.recursiveSpans.parseAndRecover( - BlockSource(processLineBreaks(firstLine), restLines.map(processLineBreaks): _*) + BlockSource(processLineBreaks(firstLine), restLines.map(processLineBreaks)*) ) ) @@ -127,7 +127,7 @@ private[laika] object BlockParsers { } val linkTarget: BlockParserBuilder = BlockParserBuilder.withEscapedText { escapedParsers => - import escapedParsers._ + import escapedParsers.* val id = "[" ~> escapedUntil(']').map(_.toLowerCase) <~ ":" <~ ws.void val url = diff --git a/core/shared/src/main/scala/laika/internal/markdown/github/AutoLinks.scala b/core/shared/src/main/scala/laika/internal/markdown/github/AutoLinks.scala index faeddba2c..ac62cae45 100644 --- a/core/shared/src/main/scala/laika/internal/markdown/github/AutoLinks.scala +++ b/core/shared/src/main/scala/laika/internal/markdown/github/AutoLinks.scala @@ -19,7 +19,7 @@ package laika.internal.markdown.github import cats.data.NonEmptySet import laika.internal.parse.uri.AutoLinkParsers import laika.parse.Parser -import laika.parse.builders._ +import laika.parse.builders.* /** Parsers for inline auto-links, which are urls or email addresses that are recognized and * inserted as links into the AST without any surrounding markup delimiters. diff --git a/core/shared/src/main/scala/laika/internal/markdown/github/FencedCodeBlocks.scala b/core/shared/src/main/scala/laika/internal/markdown/github/FencedCodeBlocks.scala index c145a6243..b5c8deaa6 100644 --- a/core/shared/src/main/scala/laika/internal/markdown/github/FencedCodeBlocks.scala +++ b/core/shared/src/main/scala/laika/internal/markdown/github/FencedCodeBlocks.scala @@ -19,8 +19,8 @@ package laika.internal.markdown.github import cats.data.NonEmptyChain import laika.api.bundle.BlockParserBuilder import laika.ast.{ CodeBlock, LiteralBlock, Span, Text } -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.{ BlockSource, Failure, Parser, Success } /** Parser for fenced code blocks as defined by GitHub Flavored Markdown and CommonMark. diff --git a/core/shared/src/main/scala/laika/internal/markdown/github/Tables.scala b/core/shared/src/main/scala/laika/internal/markdown/github/Tables.scala index 1bf059582..b77f035e3 100644 --- a/core/shared/src/main/scala/laika/internal/markdown/github/Tables.scala +++ b/core/shared/src/main/scala/laika/internal/markdown/github/Tables.scala @@ -17,12 +17,12 @@ package laika.internal.markdown.github import laika.api.bundle.BlockParserBuilder -import laika.ast._ -import laika.internal.markdown.BlockParsers._ +import laika.ast.* +import laika.internal.markdown.BlockParsers.* import laika.parse.{ LineSource, Parser } import laika.parse.text.PrefixedParser -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* /** Parser for the table extension of GitHub Flavored Markdown. * diff --git a/core/shared/src/main/scala/laika/internal/nav/NavigationOrder.scala b/core/shared/src/main/scala/laika/internal/nav/NavigationOrder.scala index 02ca8c791..1ea15f274 100644 --- a/core/shared/src/main/scala/laika/internal/nav/NavigationOrder.scala +++ b/core/shared/src/main/scala/laika/internal/nav/NavigationOrder.scala @@ -18,7 +18,7 @@ package laika.internal.nav import laika.api.config.Config import laika.config.LaikaKeys -import laika.ast._ +import laika.ast.* import laika.api.config.Config.ConfigResult /** Responsible for applying the navigation order to the contents of a document tree, diff --git a/core/shared/src/main/scala/laika/internal/parse/directive/DirectiveParsers.scala b/core/shared/src/main/scala/laika/internal/parse/directive/DirectiveParsers.scala index 5d6df0dc8..9a21867f5 100644 --- a/core/shared/src/main/scala/laika/internal/parse/directive/DirectiveParsers.scala +++ b/core/shared/src/main/scala/laika/internal/parse/directive/DirectiveParsers.scala @@ -94,7 +94,7 @@ private[laika] object DirectiveParsers { def declarationParser( supportsCustomFence: Boolean = false ): Parser[(String, ObjectBuilderValue, String)] = { - import HoconParsers._ + import HoconParsers.* val defaultFence = success("@:@") val fence = @@ -161,7 +161,7 @@ private[laika] object DirectiveParsers { */ private[laika] object SpanDirectiveParsers { - import DirectiveParsers._ + import DirectiveParsers.* import laika.api.bundle.SpanDirectives val contextRef: SpanParserBuilder = @@ -174,7 +174,7 @@ private[laika] object SpanDirectiveParsers { directives: Map[String, SpanDirectives.Directive] )(recParsers: RecursiveSpanParsers): PrefixedParser[Span] = { - import recParsers._ + import recParsers.* val separators = directives.values.flatMap(_.separators).toSet val body: BodyParserBuilder = spec => @@ -198,7 +198,7 @@ private[laika] object SpanDirectiveParsers { */ private[laika] object BlockDirectiveParsers { - import DirectiveParsers._ + import DirectiveParsers.* import laika.api.bundle.BlockDirectives def blockDirective(directives: Map[String, BlockDirectives.Directive]): BlockParserBuilder = diff --git a/core/shared/src/main/scala/laika/internal/parse/markup/DefaultEscapedTextParsers.scala b/core/shared/src/main/scala/laika/internal/parse/markup/DefaultEscapedTextParsers.scala index 105c83a36..7828d8bbb 100644 --- a/core/shared/src/main/scala/laika/internal/parse/markup/DefaultEscapedTextParsers.scala +++ b/core/shared/src/main/scala/laika/internal/parse/markup/DefaultEscapedTextParsers.scala @@ -48,7 +48,7 @@ private[internal] trait DefaultEscapedTextParsers extends EscapedTextParsers { * spans. The final character is not included in the result. */ def escapedUntil(char: Char, chars: Char*): Parser[String] = escapedText( - TextParsers.delimitedBy(char, chars: _*).nonEmpty + TextParsers.delimitedBy(char, chars*).nonEmpty ) } diff --git a/core/shared/src/main/scala/laika/internal/parse/markup/DocumentParser.scala b/core/shared/src/main/scala/laika/internal/parse/markup/DocumentParser.scala index 497a2f4fd..ae44dba2c 100644 --- a/core/shared/src/main/scala/laika/internal/parse/markup/DocumentParser.scala +++ b/core/shared/src/main/scala/laika/internal/parse/markup/DocumentParser.scala @@ -42,7 +42,7 @@ private[laika] object DocumentParser { } - private def create[D, R <: ElementContainer[_]]( + private def create[D, R <: ElementContainer[?]]( rootParser: Parser[R], configParser: Parser[ConfigParser] )(docFactory: (Path, ConfigParser, R) => D): DocumentInput => Either[ParserError, D] = { diff --git a/core/shared/src/main/scala/laika/internal/parse/markup/RootParser.scala b/core/shared/src/main/scala/laika/internal/parse/markup/RootParser.scala index 3c35b90c8..b5c72b94a 100644 --- a/core/shared/src/main/scala/laika/internal/parse/markup/RootParser.scala +++ b/core/shared/src/main/scala/laika/internal/parse/markup/RootParser.scala @@ -95,7 +95,7 @@ private[laika] class RootParser(markupParser: MarkupFormat, markupExtensions: Ma case BlockPosition.NestedOnly => lazily(nestedInterruptions) } - private def createAndSortParsers[T <: ParserDefinition[_]]( + private def createAndSortParsers[T <: ParserDefinition[?]]( mainParsers: Seq[ParserBuilder[T]], extParsers: Seq[ParserBuilder[T]] ): Seq[T] = { diff --git a/core/shared/src/main/scala/laika/internal/parse/uri/AutoLinkParsers.scala b/core/shared/src/main/scala/laika/internal/parse/uri/AutoLinkParsers.scala index 8ac2d00fe..47aea748b 100644 --- a/core/shared/src/main/scala/laika/internal/parse/uri/AutoLinkParsers.scala +++ b/core/shared/src/main/scala/laika/internal/parse/uri/AutoLinkParsers.scala @@ -20,8 +20,8 @@ import laika.api.bundle.SpanParserBuilder import laika.ast.{ Reverse, Span, SpanLink, Text } import laika.parse.text.PrefixedParser import laika.parse.{ Failure, Parser, Success } -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import URIParsers.{ fragment, path, query, regName } /** Parser for inline auto-links, which are urls or email addresses that are recognized and diff --git a/core/shared/src/main/scala/laika/internal/parse/uri/URIParsers.scala b/core/shared/src/main/scala/laika/internal/parse/uri/URIParsers.scala index 5cb55c894..9f0d8a848 100644 --- a/core/shared/src/main/scala/laika/internal/parse/uri/URIParsers.scala +++ b/core/shared/src/main/scala/laika/internal/parse/uri/URIParsers.scala @@ -17,8 +17,8 @@ package laika.internal.parse.uri import laika.parse.Parser -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.text.{ CharGroup, Characters } /** Parses URIs as defined in RFC 3986 and email addresses as defined in diff --git a/core/shared/src/main/scala/laika/internal/render/ASTRenderer.scala b/core/shared/src/main/scala/laika/internal/render/ASTRenderer.scala index fc16e48e6..ffd595e49 100644 --- a/core/shared/src/main/scala/laika/internal/render/ASTRenderer.scala +++ b/core/shared/src/main/scala/laika/internal/render/ASTRenderer.scala @@ -123,7 +123,7 @@ private[laika] object ASTRenderer extends ((Formatter, Element) => String) { case tsc: TemplateSpanContainer => elementContainerDesc(tsc, "TemplateSpans") case tc: TextContainer => textContainerDesc(tc) case Content(content, desc, _) => desc + fmt.indentedChildren(content) - case ec: ElementContainer[_] => elementContainerDesc(ec, "Elements") + case ec: ElementContainer[?] => elementContainerDesc(ec, "Elements") case e => renderElement(e) } diff --git a/core/shared/src/main/scala/laika/internal/render/FOFormatter.scala b/core/shared/src/main/scala/laika/internal/render/FOFormatter.scala index e7dcf509c..a081746e6 100644 --- a/core/shared/src/main/scala/laika/internal/render/FOFormatter.scala +++ b/core/shared/src/main/scala/laika/internal/render/FOFormatter.scala @@ -38,7 +38,7 @@ private[laika] class FOFormatter private ( def localId(ref: String): String = FOFormatter.localId(path, ref, pathTranslator) val idAttr = element.options.id.map(id => "id" -> localId(id)).toSeq - attributes(filterAttributes(tag, idAttr ++ combinedAttrs) *) + attributes(filterAttributes(tag, idAttr ++ combinedAttrs)*) } } @@ -119,31 +119,31 @@ private[laika] object FOFormatter extends (Formatter.Context[TagFormatter] => Ta /** Renders an FO `block` element and its children on the same line. */ - def block(container: ElementContainer[_ <: Element], attr: (String, String)*): String = - fmt.element("fo:block", container, attr *) + def block(container: ElementContainer[? <: Element], attr: (String, String)*): String = + fmt.element("fo:block", container, attr*) /** Renders an FO `block` element and the specified nested spans, * preserving all whitespace within the text elements of those spans. */ - def blockWithWS(container: ElementContainer[_ <: Element], attr: (String, String)*): String = - fmt.withoutIndentation(_.element("fo:block", container, attr *)) + def blockWithWS(container: ElementContainer[? <: Element], attr: (String, String)*): String = + fmt.withoutIndentation(_.element("fo:block", container, attr*)) /** Renders an FO `inline` element and its children on the same line. */ - def inline(container: ElementContainer[_ <: Element], attr: (String, String)*): String = - fmt.element("fo:inline", container, attr *) + def inline(container: ElementContainer[? <: Element], attr: (String, String)*): String = + fmt.element("fo:inline", container, attr*) /** Renders an FO `block` element, containing nested blocks. * The content will be rendered indented one level to the right. */ def blockContainer(styleHint: Element, content: Seq[Block], attr: (String, String)*): String = - fmt.indentedElement("fo:block", styleHint, content, attr *) + fmt.indentedElement("fo:block", styleHint, content, attr*) /** Renders an FO `list-block` element, and the specified list items. * The content will be rendered indented one level to the right. */ def listBlock(container: ListContainer, attr: (String, String)*): String = - fmt.indentedElement("fo:list-block", container, attr *) + fmt.indentedElement("fo:list-block", container, attr*) /** Renders an FO `list-item` element with the specified label and body. * The content will be rendered indented one level to the right. @@ -155,7 +155,7 @@ private[laika] object FOFormatter extends (Formatter.Context[TagFormatter] => Ta attr: (String, String)* ): String = { val content = List(ListItemLabel(Paragraph(label)), ListItemBody(body)) - fmt.indentedElement("fo:list-item", styleHint, content, attr: _*) + fmt.indentedElement("fo:list-item", styleHint, content, attr*) } } diff --git a/core/shared/src/main/scala/laika/internal/render/FORenderer.scala b/core/shared/src/main/scala/laika/internal/render/FORenderer.scala index f98fad07f..910788604 100644 --- a/core/shared/src/main/scala/laika/internal/render/FORenderer.scala +++ b/core/shared/src/main/scala/laika/internal/render/FORenderer.scala @@ -390,7 +390,7 @@ private[laika] object FORenderer extends ((TagFormatter, Element) => String) { fmt.optAttributes( "number-columns-spanned" -> noneIfDefault(colspan, 1), "number-rows-spanned" -> noneIfDefault(rowspan, 1) - ): _* + )* ) } diff --git a/core/shared/src/main/scala/laika/internal/render/HTMLFormatter.scala b/core/shared/src/main/scala/laika/internal/render/HTMLFormatter.scala index 92617cfc5..3bcfbc187 100644 --- a/core/shared/src/main/scala/laika/internal/render/HTMLFormatter.scala +++ b/core/shared/src/main/scala/laika/internal/render/HTMLFormatter.scala @@ -39,7 +39,7 @@ private[laika] class HTMLFormatter( val styles = if (styleHint.options.styles.isEmpty) Nil else Seq("class" -> styleHint.options.styles.mkString(" ")) - attributes((id ++ styles ++ attrs) *) + attributes((id ++ styles ++ attrs)*) } override def emptyElement( diff --git a/core/shared/src/main/scala/laika/internal/render/HTMLRenderer.scala b/core/shared/src/main/scala/laika/internal/render/HTMLRenderer.scala index c634f0bec..34c29688a 100644 --- a/core/shared/src/main/scala/laika/internal/render/HTMLRenderer.scala +++ b/core/shared/src/main/scala/laika/internal/render/HTMLRenderer.scala @@ -43,10 +43,10 @@ private[laika] class HTMLRenderer(format: String) attrs: (String, String)* ): String = container.content match { case Seq(ss: SpanSequence) => - fmt.element(tagName, ss.withOptions(container.options), attrs: _*) + fmt.element(tagName, ss.withOptions(container.options), attrs*) case Seq(Paragraph(spans, opt)) => - fmt.element(tagName, SpanSequence(spans, opt), attrs: _*) - case _ => fmt.indentedElement(tagName, container, attrs: _*) + fmt.element(tagName, SpanSequence(spans, opt), attrs*) + case _ => fmt.indentedElement(tagName, container, attrs*) } def renderTable(table: Table): String = { @@ -186,7 +186,7 @@ private[laika] class HTMLRenderer(format: String) case i: Inserted => fmt.element("ins", i) case sl: SpanLink => - fmt.element("a", sl, linkAttributes(sl.target, sl.title) *) + fmt.element("a", sl, linkAttributes(sl.target, sl.title)*) case h: Header => fmt.newLine + fmt.element("h" + h.level.toString, h) @@ -223,7 +223,7 @@ private[laika] class HTMLRenderer(format: String) fmt.optAttributes( "class" -> Some(enumFormat.enumType.toString.toLowerCase), "start" -> noneIfDefault(start, 1) - ) * + )* ) case bl: BulletList => fmt.indentedElement("ul", bl) case dl: DefinitionList => fmt.indentedElement("dl", dl) @@ -247,7 +247,7 @@ private[laika] class HTMLRenderer(format: String) } else "" case cs: CodeSpan => - fmt.textElement("span", cs.mergeOptions(Styles(cs.categories.map(_.name).toSeq *))) + fmt.textElement("span", cs.mergeOptions(Styles(cs.categories.map(_.name).toSeq*))) case l: Literal => fmt.withoutIndentation(_.textElement("code", l)) case LiteralBlock(content, opt) => fmt.element("pre", SpanSequence(Literal(content)).withOptions(opt)) @@ -293,7 +293,7 @@ private[laika] class HTMLRenderer(format: String) tagName, icon.withOptions(options), content, - fmt.optAttributes("title" -> icon.title): _* + fmt.optAttributes("title" -> icon.title)* ) } @@ -325,7 +325,7 @@ private[laika] class HTMLRenderer(format: String) "height" -> heightAttr, "style" -> styleAttr ) - fmt.emptyElement("img", img, allAttr: _*) + fmt.emptyElement("img", img, allAttr*) case icon: Icon => renderIcon(icon) case lb: LineBreak => fmt.emptyElement("br", lb) @@ -351,7 +351,7 @@ private[laika] class HTMLRenderer(format: String) "colspan" -> noneIfDefault(c.colspan, 1), "rowspan" -> noneIfDefault(c.rowspan, 1) ) - renderBlocks(tagName, c, attributes *) + renderBlocks(tagName, c, attributes*) } def renderUnresolvedReference(ref: Reference): String = diff --git a/core/shared/src/main/scala/laika/internal/rewrite/RecursiveResolverRules.scala b/core/shared/src/main/scala/laika/internal/rewrite/RecursiveResolverRules.scala index 09b32c75c..a542571b8 100644 --- a/core/shared/src/main/scala/laika/internal/rewrite/RecursiveResolverRules.scala +++ b/core/shared/src/main/scala/laika/internal/rewrite/RecursiveResolverRules.scala @@ -16,7 +16,7 @@ package laika.internal.rewrite -import laika.ast._ +import laika.ast.* import laika.ast.RewriteAction.Replace private[laika] object RecursiveResolverRules { @@ -32,7 +32,7 @@ private[laika] object RecursiveResolverRules { phase: RewritePhase ): RewriteRules = { - def rulesForScope(scope: ElementScope[_]): RewriteRules = + def rulesForScope(scope: ElementScope[?]): RewriteRules = applyTo(cursor.withReferenceContext(scope.context), baseRules, phase) lazy val rules: RewriteRules = RewriteRules.forBlocks { diff --git a/core/shared/src/main/scala/laika/internal/rewrite/TemplateFormatter.scala b/core/shared/src/main/scala/laika/internal/rewrite/TemplateFormatter.scala index 02c10e624..37663c141 100644 --- a/core/shared/src/main/scala/laika/internal/rewrite/TemplateFormatter.scala +++ b/core/shared/src/main/scala/laika/internal/rewrite/TemplateFormatter.scala @@ -16,7 +16,7 @@ package laika.internal.rewrite -import laika.ast._ +import laika.ast.* import laika.ast.RewriteAction.Replace import laika.ast.RewriteRules.RewriteRulesBuilder import laika.api.config.Config.ConfigResult diff --git a/core/shared/src/main/scala/laika/internal/rst/BaseParsers.scala b/core/shared/src/main/scala/laika/internal/rst/BaseParsers.scala index dfac319b3..1f6f99da0 100644 --- a/core/shared/src/main/scala/laika/internal/rst/BaseParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/BaseParsers.scala @@ -17,10 +17,10 @@ package laika.internal.rst import cats.data.NonEmptySet -import laika.ast._ +import laika.ast.* import laika.parse.Parser -import laika.parse.syntax._ -import laika.parse.builders._ +import laika.parse.syntax.* +import laika.parse.builders.* import laika.parse.text.{ CharGroup, Characters } /** @author Jens Halm diff --git a/core/shared/src/main/scala/laika/internal/rst/BlockParsers.scala b/core/shared/src/main/scala/laika/internal/rst/BlockParsers.scala index ee40bc391..169e2fb3f 100644 --- a/core/shared/src/main/scala/laika/internal/rst/BlockParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/BlockParsers.scala @@ -17,9 +17,9 @@ package laika.internal.rst import cats.data.NonEmptyChain -import laika.ast._ -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.ast.* +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.text.Characters import laika.parse.{ BlockSource, @@ -30,7 +30,7 @@ import laika.parse.{ SourceFragment, Success } -import BaseParsers._ +import BaseParsers.* import laika.api.bundle.BlockParserBuilder import laika.internal.rst.ast.{ DoctestBlock, OverlineAndUnderline, Underline } diff --git a/core/shared/src/main/scala/laika/internal/rst/ExplicitBlockParsers.scala b/core/shared/src/main/scala/laika/internal/rst/ExplicitBlockParsers.scala index a552f9ee9..b148dc489 100644 --- a/core/shared/src/main/scala/laika/internal/rst/ExplicitBlockParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/ExplicitBlockParsers.scala @@ -34,7 +34,7 @@ import laika.parse.text.PrefixedParser */ private[laika] class ExplicitBlockParsers(recParsers: RecursiveParsers) { - import recParsers._ + import recParsers.* private val explicitStart = ".." ~ ws.min(1) diff --git a/core/shared/src/main/scala/laika/internal/rst/InlineParsers.scala b/core/shared/src/main/scala/laika/internal/rst/InlineParsers.scala index 19aa5cc38..09ded12f8 100644 --- a/core/shared/src/main/scala/laika/internal/rst/InlineParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/InlineParsers.scala @@ -18,14 +18,14 @@ package laika.internal.rst import cats.data.NonEmptySet import laika.api.bundle.SpanParserBuilder -import laika.ast._ -import laika.internal.collection.TransitionalCollectionOps._ +import laika.ast.* +import laika.internal.collection.TransitionalCollectionOps.* import laika.parse.markup.RecursiveSpanParsers import laika.parse.text.PrefixedParser -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.{ Failure, LineSource, Parser, Success } -import BaseParsers._ +import BaseParsers.* import laika.internal.parse.uri.AutoLinkParsers import laika.internal.rst.ast.{ InterpretedText, ReferenceName, RstStyle, SubstitutionReference } diff --git a/core/shared/src/main/scala/laika/internal/rst/ListParsers.scala b/core/shared/src/main/scala/laika/internal/rst/ListParsers.scala index 52b845c51..09e89f72d 100644 --- a/core/shared/src/main/scala/laika/internal/rst/ListParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/ListParsers.scala @@ -105,7 +105,7 @@ private[laika] object ListParsers { } private lazy val enumListStart: Parser[(EnumFormat, Int)] = { - import EnumType._ + import EnumType.* val firstLowerRoman = (someOf('i', 'v', 'x', 'l', 'c', 'd', 'm').min(2) | oneOf('i')).evalMap { num => RomanNumerals.romanToInt(num.toUpperCase).map(_ -> LowerRoman) } @@ -136,7 +136,7 @@ private[laika] object ListParsers { } lazy val enumList: BlockParserBuilder = BlockParserBuilder.recursive { implicit recParsers => - import EnumType._ + import EnumType.* val lowerRoman = someOf('i', 'v', 'x', 'l', 'c', 'd', 'm') val upperRoman = someOf('I', 'V', 'X', 'L', 'C', 'D', 'M') diff --git a/core/shared/src/main/scala/laika/internal/rst/TableParsers.scala b/core/shared/src/main/scala/laika/internal/rst/TableParsers.scala index e0cd6bd3b..6fc498848 100644 --- a/core/shared/src/main/scala/laika/internal/rst/TableParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/TableParsers.scala @@ -18,12 +18,12 @@ package laika.internal.rst import cats.data.NonEmptyChain import laika.api.bundle.BlockParserBuilder -import laika.ast._ +import laika.ast.* import laika.internal.collection.Stack import laika.internal.collection.TransitionalCollectionOps.Zip3Iterator -import laika.parse.builders._ -import laika.parse.syntax._ -import laika.parse._ +import laika.parse.builders.* +import laika.parse.syntax.* +import laika.parse.* import laika.parse.markup.RecursiveParsers import scala.annotation.nowarn @@ -360,7 +360,7 @@ private[laika] object TableParsers { val rowBuffer = rows.foldLeft((ListBuffer[List[TableElement]](), 0, false)) { case ((acc, blanks, rowOpen), row) => row match { - case result: ~[_, _] => + case result: ~[?, ?] => val row = flattenElements(result) row.head match { case RowSeparator => (acc += row, 0, false) diff --git a/core/shared/src/main/scala/laika/internal/rst/bundle/DocInfoExtractor.scala b/core/shared/src/main/scala/laika/internal/rst/bundle/DocInfoExtractor.scala index 87ffe2c37..f6562912b 100644 --- a/core/shared/src/main/scala/laika/internal/rst/bundle/DocInfoExtractor.scala +++ b/core/shared/src/main/scala/laika/internal/rst/bundle/DocInfoExtractor.scala @@ -16,7 +16,7 @@ package laika.internal.rst.bundle -import laika.ast._ +import laika.ast.* import laika.internal.rst.ast.FieldList /** Responsible for extracting a docInfo block at the start of a reStructuredText document diff --git a/core/shared/src/main/scala/laika/internal/rst/bundle/LinkTargetProcessor.scala b/core/shared/src/main/scala/laika/internal/rst/bundle/LinkTargetProcessor.scala index a5128df6f..2ed58c124 100644 --- a/core/shared/src/main/scala/laika/internal/rst/bundle/LinkTargetProcessor.scala +++ b/core/shared/src/main/scala/laika/internal/rst/bundle/LinkTargetProcessor.scala @@ -16,7 +16,7 @@ package laika.internal.rst.bundle -import laika.ast._ +import laika.ast.* import scala.collection.mutable.ListBuffer diff --git a/core/shared/src/main/scala/laika/internal/rst/ext/Directives.scala b/core/shared/src/main/scala/laika/internal/rst/ext/Directives.scala index 11a8aac29..014b683f0 100644 --- a/core/shared/src/main/scala/laika/internal/rst/ext/Directives.scala +++ b/core/shared/src/main/scala/laika/internal/rst/ext/Directives.scala @@ -322,7 +322,7 @@ private[rst] object Directives { */ object Parts { - import Converters._ + import Converters.* private def requiredPart[T]( build: DirectiveParserBuilder => (Key, DirectiveParserBuilder), diff --git a/core/shared/src/main/scala/laika/internal/rst/ext/ExtensionParsers.scala b/core/shared/src/main/scala/laika/internal/rst/ext/ExtensionParsers.scala index 802ef0428..71b05c08a 100644 --- a/core/shared/src/main/scala/laika/internal/rst/ext/ExtensionParsers.scala +++ b/core/shared/src/main/scala/laika/internal/rst/ext/ExtensionParsers.scala @@ -46,7 +46,7 @@ private[rst] class ExtensionParsers( defaultTextRole: String ) { - import recParsers._ + import recParsers.* private val explicitStart = ".." ~ ws.min(1) diff --git a/core/shared/src/main/scala/laika/internal/rst/ext/TextRoles.scala b/core/shared/src/main/scala/laika/internal/rst/ext/TextRoles.scala index 75020d2d1..a877bc47d 100644 --- a/core/shared/src/main/scala/laika/internal/rst/ext/TextRoles.scala +++ b/core/shared/src/main/scala/laika/internal/rst/ext/TextRoles.scala @@ -221,7 +221,7 @@ private[rst] object TextRoles { */ object Parts { - import Directives.Converters._ + import Directives.Converters.* private def requiredPart[T]( build: RoleDirectiveParserBuilder => (Key, RoleDirectiveParserBuilder), diff --git a/core/shared/src/main/scala/laika/internal/rst/std/StandardBlockDirectives.scala b/core/shared/src/main/scala/laika/internal/rst/std/StandardBlockDirectives.scala index fa1006256..9ff05f926 100644 --- a/core/shared/src/main/scala/laika/internal/rst/std/StandardBlockDirectives.scala +++ b/core/shared/src/main/scala/laika/internal/rst/std/StandardBlockDirectives.scala @@ -328,7 +328,7 @@ private[rst] class StandardBlockDirectives { */ lazy val rawDirective: Directive[Block] = BlockDirective("raw") { (argument(withWS = true) ~ content(Right(_))).map { case formats ~ content => - NonEmptySet.fromSet(TreeSet(formats.split(" ").toIndexedSeq *)) match { + NonEmptySet.fromSet(TreeSet(formats.split(" ").toIndexedSeq*)) match { case Some(set) => RawContent(set, content.input) case None => InvalidBlock("no format specified", SourceCursor.Generated) } diff --git a/core/shared/src/main/scala/laika/internal/rst/std/StandardDirectiveParts.scala b/core/shared/src/main/scala/laika/internal/rst/std/StandardDirectiveParts.scala index 38e13b9f6..4f22dfc66 100644 --- a/core/shared/src/main/scala/laika/internal/rst/std/StandardDirectiveParts.scala +++ b/core/shared/src/main/scala/laika/internal/rst/std/StandardDirectiveParts.scala @@ -55,7 +55,7 @@ private[std] object StandardDirectiveParts { * see [[http://docutils.sourceforge.net/docs/ref/rst/directives.html#image]] for details. */ def image(p: RecursiveParsers): DirectivePartBuilder[Span] = { - import TextParsers._ + import TextParsers.* def multilineURI(text: SourceFragment) = Right( text.input.split("\n").map(_.trim).mkString("\n").trim diff --git a/core/shared/src/main/scala/laika/internal/rst/std/StandardTextRoles.scala b/core/shared/src/main/scala/laika/internal/rst/std/StandardTextRoles.scala index bcc4590e0..6f2f3f749 100644 --- a/core/shared/src/main/scala/laika/internal/rst/std/StandardTextRoles.scala +++ b/core/shared/src/main/scala/laika/internal/rst/std/StandardTextRoles.scala @@ -151,7 +151,7 @@ private[rst] class StandardTextRoles { TextRole("raw", (Nil: List[String], Options.empty)) { (field("format") ~ classOption).map { case format ~ opt => (format.split(" ").toList, opt) } } { case ((formats, opt), content) => - NonEmptySet.fromSet(TreeSet(formats: _*)) match { + NonEmptySet.fromSet(TreeSet(formats*)) match { case Some(set) => RawContent(set, content, opt) case None => InvalidSpan("no format specified", SourceCursor.Generated) } diff --git a/core/shared/src/main/scala/laika/parse/Parsed.scala b/core/shared/src/main/scala/laika/parse/Parsed.scala index 041da462d..7b566e87a 100644 --- a/core/shared/src/main/scala/laika/parse/Parsed.scala +++ b/core/shared/src/main/scala/laika/parse/Parsed.scala @@ -110,7 +110,7 @@ case class Failure(msgProvider: Message, next: SourceCursor, maxOffset: Int) def toEither: Either[String, Nothing] = Left(message) def orElse[U >: Nothing](default: => Parsed[U]): Parsed[U] = default match { - case s: Success[_] => s + case s: Success[?] => s case f: Failure => if (f.maxOffset > maxOffset) f else this } diff --git a/core/shared/src/main/scala/laika/parse/SourceCursor.scala b/core/shared/src/main/scala/laika/parse/SourceCursor.scala index 5fea5a527..ba0dfddd2 100644 --- a/core/shared/src/main/scala/laika/parse/SourceCursor.scala +++ b/core/shared/src/main/scala/laika/parse/SourceCursor.scala @@ -360,7 +360,7 @@ class BlockSource( */ object BlockSource { - import cats.syntax.all._ + import cats.syntax.all.* /** Creates a new block source for the specified lines. * Each line can have a different x- and y-offset from the root input as they may have been obtained @@ -379,7 +379,7 @@ object BlockSource { * by a previously applied block parser that stripped some decoration. */ def apply(firstLine: LineSource, rest: LineSource*): BlockSource = { - apply(NonEmptyChain(firstLine, rest: _*)) + apply(NonEmptyChain(firstLine, rest*)) } } diff --git a/core/shared/src/main/scala/laika/parse/code/CodeSpanParser.scala b/core/shared/src/main/scala/laika/parse/code/CodeSpanParser.scala index 4cab65742..016668e9a 100644 --- a/core/shared/src/main/scala/laika/parse/code/CodeSpanParser.scala +++ b/core/shared/src/main/scala/laika/parse/code/CodeSpanParser.scala @@ -19,9 +19,9 @@ package laika.parse.code import laika.ast.{ CategorizedCode, CodeSpan, CodeSpanSequence } import laika.parse.Parser import laika.parse.text.PrefixedParser -import laika.parse.builders._ -import laika.parse.syntax._ -import laika.parse.code.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* +import laika.parse.code.syntax.* /** A collection of code span parsers that are intended to be applied together. */ diff --git a/core/shared/src/main/scala/laika/parse/code/common/CharLiteral.scala b/core/shared/src/main/scala/laika/parse/code/common/CharLiteral.scala index 9aaf65d72..25e0fd35b 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/CharLiteral.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/CharLiteral.scala @@ -19,9 +19,9 @@ package laika.parse.code.common import laika.ast.{ CodeSpan, CodeSpans } import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.PrefixedParser -import laika.parse.builders._ -import laika.parse.code.syntax._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.code.syntax.* +import laika.parse.syntax.* /** Configurable base parsers for character literals. * diff --git a/core/shared/src/main/scala/laika/parse/code/common/Comment.scala b/core/shared/src/main/scala/laika/parse/code/common/Comment.scala index d862f8d8e..d53dbe698 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/Comment.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/Comment.scala @@ -16,8 +16,8 @@ package laika.parse.code.common -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.code.{ CodeCategory, CodeSpanParser } /** Configurable base parsers for comments in code blocks. diff --git a/core/shared/src/main/scala/laika/parse/code/common/EmbeddedCodeSpans.scala b/core/shared/src/main/scala/laika/parse/code/common/EmbeddedCodeSpans.scala index be9ea3e21..488664cb9 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/EmbeddedCodeSpans.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/EmbeddedCodeSpans.scala @@ -22,8 +22,8 @@ import laika.parse.Parser import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.markup.InlineParsers import laika.parse.text.DelimitedText -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* /** Factories for creating a span parser that detects other syntax as part of the span. * diff --git a/core/shared/src/main/scala/laika/parse/code/common/Identifier.scala b/core/shared/src/main/scala/laika/parse/code/common/Identifier.scala index c3bdb73b8..81da94f0f 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/Identifier.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/Identifier.scala @@ -19,7 +19,7 @@ package laika.parse.code.common import cats.data.NonEmptySet import laika.ast.{ CategorizedCode, CodeSpan } import laika.parse.code.{ CodeCategory, CodeSpanParser } -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.text.{ CharGroup, PrefixedParser } /** Configurable base parsers for identifiers in code blocks. @@ -62,7 +62,7 @@ object Identifier { * Will also be added to the set of characters for the parser of the rest of the identifier. */ def withIdStartChars(char: Char, chars: Char*): IdParser = { - val startChars = idStartChars ++ NonEmptySet.of(char, chars: _*) + val startChars = idStartChars ++ NonEmptySet.of(char, chars*) new IdParser(startChars, nonStartChars, category, prefixParser, digitBeforeStart) } @@ -70,7 +70,7 @@ object Identifier { * but not allowed as the first character. */ def withIdPartChars(char: Char, chars: Char*): IdParser = { - val partChars = nonStartChars ++ NonEmptySet.of(char, chars: _*) + val partChars = nonStartChars ++ NonEmptySet.of(char, chars*) new IdParser(idStartChars, partChars, category, prefixParser, digitBeforeStart) } diff --git a/core/shared/src/main/scala/laika/parse/code/common/Keywords.scala b/core/shared/src/main/scala/laika/parse/code/common/Keywords.scala index 7c99ded14..a8b912fd3 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/Keywords.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/Keywords.scala @@ -16,7 +16,7 @@ package laika.parse.code.common -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.PrefixedParser @@ -28,7 +28,7 @@ object Keywords { /** Parses the specified list of keywords. */ def apply(keyword: String, keywords: String*): CodeSpanParser = - apply(CodeCategory.Keyword)(keyword, keywords: _*) + apply(CodeCategory.Keyword)(keyword, keywords*) /** Parses the specified list of keywords, but associates it with the specified * code category and not with the `Keyword` category. diff --git a/core/shared/src/main/scala/laika/parse/code/common/RegexLiteral.scala b/core/shared/src/main/scala/laika/parse/code/common/RegexLiteral.scala index b61a9da38..04399c6f3 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/RegexLiteral.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/RegexLiteral.scala @@ -18,7 +18,7 @@ package laika.parse.code.common import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.CharGroup -import laika.parse.builders._ +import laika.parse.builders.* /** Base parsers for regular expression literals in code blocks. * diff --git a/core/shared/src/main/scala/laika/parse/code/common/StringLiteral.scala b/core/shared/src/main/scala/laika/parse/code/common/StringLiteral.scala index 82d118fe3..74c9addbb 100644 --- a/core/shared/src/main/scala/laika/parse/code/common/StringLiteral.scala +++ b/core/shared/src/main/scala/laika/parse/code/common/StringLiteral.scala @@ -18,10 +18,10 @@ package laika.parse.code.common import laika.ast.{ CodeSpan, CodeSpans } import laika.parse.Parser -import laika.parse.builders._ -import laika.parse.code.syntax._ +import laika.parse.builders.* +import laika.parse.code.syntax.* import laika.parse.code.{ CodeCategory, CodeSpanParser } -import laika.parse.syntax._ +import laika.parse.syntax.* import laika.parse.text.{ PrefixedParser, TextParsers } /** Configurable base parsers for string literals. @@ -30,7 +30,7 @@ import laika.parse.text.{ PrefixedParser, TextParsers } */ object StringLiteral { - import NumberLiteral._ + import NumberLiteral.* /** Base parsers for escape sequences. */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/CSSSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/CSSSyntax.scala index e6632b263..3215d1a70 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/CSSSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/CSSSyntax.scala @@ -20,13 +20,13 @@ import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter import laika.ast.CodeSpan import laika.parse.Parser -import laika.parse.code.common._ +import laika.parse.code.common.* import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.Characters -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.code.common.NumberLiteral.digits -import laika.parse.code.syntax._ -import laika.parse.syntax._ +import laika.parse.code.syntax.* +import laika.parse.syntax.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/DartSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/DartSyntax.scala index 4aaeac76b..729323fdb 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/DartSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/DartSyntax.scala @@ -2,7 +2,7 @@ package laika.parse.code.languages import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter -import laika.parse.syntax._ +import laika.parse.syntax.* import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue, TypeName } import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.common.{ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/DhallSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/DhallSyntax.scala index 99a5c749d..bca80cb98 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/DhallSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/DhallSyntax.scala @@ -20,13 +20,13 @@ import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter import laika.ast.CodeSpan import laika.parse.code.common.NumberLiteral.digits -import laika.parse.code.common._ -import laika.parse.code.syntax._ +import laika.parse.code.common.* +import laika.parse.code.syntax.* import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.builders.~ -import laika.parse.syntax._ +import laika.parse.syntax.* import laika.parse.text.{ CharGroup, PrefixedParser } -import laika.parse.text.TextParsers._ +import laika.parse.text.TextParsers.* /** https://github.com/dhall-lang/dhall-lang/blob/master/standard/dhall.abnf * @author Michał Sitko diff --git a/core/shared/src/main/scala/laika/parse/code/languages/EBNFSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/EBNFSyntax.scala index 91bdb1000..3ecc72af3 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/EBNFSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/EBNFSyntax.scala @@ -20,9 +20,9 @@ import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.common.{ Identifier, StringLiteral } -import laika.parse.code.syntax._ -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.code.syntax.* +import laika.parse.builders.* +import laika.parse.syntax.* /** This highlighter is very loosely defined with the aim to work for most of * the dozens of flavors of EBNF that are widely used. diff --git a/core/shared/src/main/scala/laika/parse/code/languages/HOCONSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/HOCONSyntax.scala index a9fbe1694..84f072045 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/HOCONSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/HOCONSyntax.scala @@ -29,7 +29,7 @@ import laika.parse.code.common.{ NumberLiteral, StringLiteral } -import laika.parse.code.syntax._ +import laika.parse.code.syntax.* import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.PrefixedParser import laika.parse.text.TextParsers.* @@ -61,7 +61,7 @@ object HOCONSyntax extends SyntaxHighlighter { Character.toChars(i)(0) }) .filterNot(c => invalidUnquotedChar.contains(c) || Character.isWhitespace(c)) - NonEmptySet.fromSetUnsafe(SortedSet(startChars: _*)) + NonEmptySet.fromSetUnsafe(SortedSet(startChars*)) } private val unquotedChar = { diff --git a/core/shared/src/main/scala/laika/parse/code/languages/JSONSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/JSONSyntax.scala index 963a76bd8..8ef0077cd 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/JSONSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/JSONSyntax.scala @@ -22,7 +22,7 @@ import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue } import laika.parse.code.common.StringLiteral.StringParser import laika.parse.code.common.{ Keywords, NumberLiteral, StringLiteral } -import laika.parse.builders._ +import laika.parse.builders.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/JavaScriptSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/JavaScriptSyntax.scala index 2daa574d6..a2398a6dd 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/JavaScriptSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/JavaScriptSyntax.scala @@ -20,9 +20,9 @@ import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue } import laika.parse.code.common.NumberLiteral.{ digits, NumericParser } -import laika.parse.code.common._ +import laika.parse.code.common.* import laika.parse.code.{ CodeCategory, CodeSpanParser } -import laika.parse.syntax._ +import laika.parse.syntax.* /** @author Jens Halm */ @@ -110,7 +110,7 @@ object JavaScriptSyntax extends SyntaxHighlighter { object JSX extends SyntaxHighlighter { - import TagFormats._ + import TagFormats.* val language: NonEmptyList[String] = NonEmptyList.of("jsx") diff --git a/core/shared/src/main/scala/laika/parse/code/languages/JavaSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/JavaSyntax.scala index d2e301a39..4e6ffa9ef 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/JavaSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/JavaSyntax.scala @@ -18,7 +18,7 @@ package laika.parse.code.languages import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter -import laika.parse.syntax._ +import laika.parse.syntax.* import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue, TypeName } import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.common.{ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/LaikaASTSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/LaikaASTSyntax.scala index de1abf9e5..92623342e 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/LaikaASTSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/LaikaASTSyntax.scala @@ -18,7 +18,7 @@ package laika.parse.code.languages import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.code.common.{ Identifier, Keywords, NumberLiteral, StringLiteral } import laika.parse.code.{ CodeCategory, CodeSpanParser } diff --git a/core/shared/src/main/scala/laika/parse/code/languages/MarkdownSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/MarkdownSyntax.scala index 73749d5b1..db8e2467d 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/MarkdownSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/MarkdownSyntax.scala @@ -22,9 +22,9 @@ import laika.ast.CodeSpan import laika.parse.code.common.StringLiteral import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.text.PrefixedParser -import laika.parse.builders._ -import laika.parse.syntax._ -import laika.parse.code.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* +import laika.parse.code.syntax.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/PythonSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/PythonSyntax.scala index 7e88c7307..d1dc83b3c 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/PythonSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/PythonSyntax.scala @@ -21,7 +21,7 @@ import laika.api.bundle.SyntaxHighlighter import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue } import laika.parse.code.CodeSpanParser import laika.parse.code.common.StringLiteral.StringParser -import laika.parse.code.common._ +import laika.parse.code.common.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/ReStructuredTextSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/ReStructuredTextSyntax.scala index 08eeffcdc..5438926c6 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/ReStructuredTextSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/ReStructuredTextSyntax.scala @@ -21,9 +21,9 @@ import laika.api.bundle.SyntaxHighlighter import laika.ast.CodeSpan import laika.internal.rst.BaseParsers import laika.parse.Parser -import laika.parse.builders._ -import laika.parse.syntax._ -import laika.parse.code.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* +import laika.parse.code.syntax.* import laika.parse.code.common.StringLiteral import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.internal.rst.InlineParsers.{ markupEnd, markupStart } diff --git a/core/shared/src/main/scala/laika/parse/code/languages/SQLSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/SQLSyntax.scala index 8d6286e93..0f63fc96a 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/SQLSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/SQLSyntax.scala @@ -18,7 +18,7 @@ package laika.parse.code.languages import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.common.{ Comment, Identifier, Keywords, NumberLiteral, StringLiteral } @@ -36,8 +36,8 @@ object SQLSyntax extends SyntaxHighlighter { private def caseInsensitiveKeywords(category: CodeCategory)(kws: String*): CodeSpanParser = { val upper = kws.map(_.toUpperCase) // mixed case rare enough in practice to get ignored here - Keywords(category)(kws.head, kws.tail: _*) ++ - Keywords(category)(upper.head, upper.tail: _*) + Keywords(category)(kws.head, kws.tail*) ++ + Keywords(category)(upper.head, upper.tail*) } private val keywords: CodeSpanParser = caseInsensitiveKeywords(CodeCategory.Keyword)( diff --git a/core/shared/src/main/scala/laika/parse/code/languages/ScalaSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/ScalaSyntax.scala index 250854b37..1221bcaad 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/ScalaSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/ScalaSyntax.scala @@ -29,10 +29,10 @@ import laika.parse.code.common.{ StringLiteral } import laika.parse.text.{ CharGroup, PrefixedParser } -import laika.parse.builders._ -import laika.parse.syntax._ +import laika.parse.builders.* +import laika.parse.syntax.* import laika.parse.code.common.Identifier.IdParser -import laika.parse.code.syntax._ +import laika.parse.code.syntax.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/ShellSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/ShellSyntax.scala index 4b597dffe..64a9d71d6 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/ShellSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/ShellSyntax.scala @@ -18,11 +18,11 @@ package laika.parse.code.languages import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter -import laika.parse.builders._ +import laika.parse.builders.* import laika.parse.code.CodeCategory.BooleanLiteral import laika.parse.code.{ CodeCategory, CodeSpanParser } import laika.parse.code.common.{ Comment, Keywords, NumberLiteral, StringLiteral } -import laika.parse.syntax._ +import laika.parse.syntax.* import laika.parse.text.CharGroup object ShellSyntax extends SyntaxHighlighter { @@ -108,7 +108,7 @@ object ShellSyntax extends SyntaxHighlighter { singleQuoteEscape ), StringLiteral.singleLine('"').embed( - (substitutions :+ doubleQuoteEscape): _* + (substitutions :+ doubleQuoteEscape)* ) ) ++ substitutions diff --git a/core/shared/src/main/scala/laika/parse/code/languages/TypeScriptSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/TypeScriptSyntax.scala index c73509df1..3b18ba842 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/TypeScriptSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/TypeScriptSyntax.scala @@ -20,7 +20,7 @@ import cats.data.NonEmptyList import laika.api.bundle.SyntaxHighlighter import laika.parse.code.CodeCategory.{ BooleanLiteral, LiteralValue, TypeName } import laika.parse.code.CodeSpanParser -import laika.parse.code.common._ +import laika.parse.code.common.* /** @author Jens Halm */ diff --git a/core/shared/src/main/scala/laika/parse/code/languages/XMLSyntax.scala b/core/shared/src/main/scala/laika/parse/code/languages/XMLSyntax.scala index e6e8c8a3a..745ba8ac9 100644 --- a/core/shared/src/main/scala/laika/parse/code/languages/XMLSyntax.scala +++ b/core/shared/src/main/scala/laika/parse/code/languages/XMLSyntax.scala @@ -25,7 +25,7 @@ import laika.parse.code.{ CodeCategory, CodeSpanParser } */ object XMLSyntax extends SyntaxHighlighter { - import TagFormats._ + import TagFormats.* private val pi: CodeSpanParser = CodeSpanParser(CodeCategory.XML.ProcessingInstruction, "") diff --git a/core/shared/src/main/scala/laika/parse/combinator/Parsers.scala b/core/shared/src/main/scala/laika/parse/combinator/Parsers.scala index 709b1b854..7a645fd7f 100644 --- a/core/shared/src/main/scala/laika/parse/combinator/Parsers.scala +++ b/core/shared/src/main/scala/laika/parse/combinator/Parsers.scala @@ -19,7 +19,7 @@ package laika.parse.combinator import laika.parse.* import laika.parse.text.TextParsers -import scala.util.{ Try, Failure => TFailure, Success => TSuccess } +import scala.util.{ Try, Failure as TFailure, Success as TSuccess } /** Generic base parsers which are not specifically tailored for parsing of text markup. * diff --git a/core/shared/src/main/scala/laika/parse/combinator/Repeat.scala b/core/shared/src/main/scala/laika/parse/combinator/Repeat.scala index 215c89e80..2b99f6e92 100644 --- a/core/shared/src/main/scala/laika/parse/combinator/Repeat.scala +++ b/core/shared/src/main/scala/laika/parse/combinator/Repeat.scala @@ -16,7 +16,7 @@ package laika.parse.combinator -import laika.parse._ +import laika.parse.* import scala.annotation.tailrec import scala.collection.mutable.ListBuffer diff --git a/core/shared/src/main/scala/laika/parse/markup/BlockParsers.scala b/core/shared/src/main/scala/laika/parse/markup/BlockParsers.scala index 7badb1524..8758e9161 100644 --- a/core/shared/src/main/scala/laika/parse/markup/BlockParsers.scala +++ b/core/shared/src/main/scala/laika/parse/markup/BlockParsers.scala @@ -16,9 +16,9 @@ package laika.parse.markup -import laika.parse.builders._ -import laika.parse.syntax._ -import laika.parse._ +import laika.parse.builders.* +import laika.parse.syntax.* +import laika.parse.* /** Provides base parsers that abstract aspects of block parsing common to most lightweight markup languages. * @@ -66,7 +66,7 @@ trait BlockParsers { lazy val nextBlock: Parser[LineSource] = blankLines.mkLines.line <~ lookAhead(nextBlockPrefix) (firstLine ~ (line | nextBlock).rep).map { case first ~ rest => - BlockSource(first, rest: _*) + BlockSource(first, rest*) } } @@ -118,7 +118,7 @@ trait BlockParsers { maxIndent: Int = Int.MaxValue ): Parser[(BlockSource, Int)] = { - import scala.math._ + import scala.math.* sealed trait Line extends Product { def curIndent: Int @@ -166,7 +166,7 @@ trait BlockParsers { val extraIndent = indent - minIndent LineSource(" " * extraIndent + src.input, src.parent.consume(extraIndent * -1)) } - (BlockSource(adjustedLines.head, adjustedLines.tail: _*), minIndent) + (BlockSource(adjustedLines.head, adjustedLines.tail*), minIndent) } lookAhead(firstLineGuard) ~> firstLine.repWith(nextLine) ^^ result diff --git a/core/shared/src/main/scala/laika/parse/text/CharGroup.scala b/core/shared/src/main/scala/laika/parse/text/CharGroup.scala index 161d23840..0c52e4775 100644 --- a/core/shared/src/main/scala/laika/parse/text/CharGroup.scala +++ b/core/shared/src/main/scala/laika/parse/text/CharGroup.scala @@ -29,7 +29,7 @@ import cats.data.NonEmptySet object CharGroup { private def setForRange(range: Seq[Char]): NonEmptySet[Char] = - NonEmptySet.of(range.head, range.tail: _*) + NonEmptySet.of(range.head, range.tail*) /** All decimal digits (0 to 9). */ diff --git a/core/shared/src/main/scala/laika/parse/text/Characters.scala b/core/shared/src/main/scala/laika/parse/text/Characters.scala index 5c99bc469..21222e1b1 100644 --- a/core/shared/src/main/scala/laika/parse/text/Characters.scala +++ b/core/shared/src/main/scala/laika/parse/text/Characters.scala @@ -16,7 +16,7 @@ package laika.parse.text -import laika.parse._ +import laika.parse.* import scala.annotation.tailrec diff --git a/core/shared/src/main/scala/laika/parse/text/DelimitedText.scala b/core/shared/src/main/scala/laika/parse/text/DelimitedText.scala index 9cf86047e..c00b1b8a8 100644 --- a/core/shared/src/main/scala/laika/parse/text/DelimitedText.scala +++ b/core/shared/src/main/scala/laika/parse/text/DelimitedText.scala @@ -16,8 +16,8 @@ package laika.parse.text -import laika.parse._ -import laika.parse.text.DelimiterResult._ +import laika.parse.* +import laika.parse.text.DelimiterResult.* import scala.annotation.tailrec diff --git a/core/shared/src/main/scala/laika/parse/text/DelimiterParser.scala b/core/shared/src/main/scala/laika/parse/text/DelimiterParser.scala index 39ffa17f5..ba17411d7 100644 --- a/core/shared/src/main/scala/laika/parse/text/DelimiterParser.scala +++ b/core/shared/src/main/scala/laika/parse/text/DelimiterParser.scala @@ -87,7 +87,7 @@ class DelimiterParser private[text] ( /** Ensures that the character immediately preceding the delimiter * is not one of the specified characters. */ - def prevNot(char: Char, chars: Char*): DelimiterParser = prevNot(NonEmptySet.of(char, chars: _*)) + def prevNot(char: Char, chars: Char*): DelimiterParser = prevNot(NonEmptySet.of(char, chars*)) /** Ensures that the character immediately preceding the delimiter * is not in the specified set. @@ -103,7 +103,7 @@ class DelimiterParser private[text] ( /** Ensures that the character immediately following the delimiter * is not one of the specified characters. */ - def nextNot(char: Char, chars: Char*): DelimiterParser = nextNot(NonEmptySet.of(char, chars: _*)) + def nextNot(char: Char, chars: Char*): DelimiterParser = nextNot(NonEmptySet.of(char, chars*)) /** Ensures that the character immediately following the delimiter * is not in the specified set. diff --git a/core/shared/src/main/scala/laika/parse/text/Literal.scala b/core/shared/src/main/scala/laika/parse/text/Literal.scala index 20ba3ac9d..a2628e05f 100644 --- a/core/shared/src/main/scala/laika/parse/text/Literal.scala +++ b/core/shared/src/main/scala/laika/parse/text/Literal.scala @@ -17,7 +17,7 @@ package laika.parse.text import cats.data.NonEmptySet -import laika.parse._ +import laika.parse.* /** A parser that matches a literal string. * diff --git a/core/shared/src/main/scala/laika/parse/text/PrefixedParser.scala b/core/shared/src/main/scala/laika/parse/text/PrefixedParser.scala index b3a4b3d0b..49ccfadbf 100644 --- a/core/shared/src/main/scala/laika/parse/text/PrefixedParser.scala +++ b/core/shared/src/main/scala/laika/parse/text/PrefixedParser.scala @@ -114,7 +114,7 @@ trait PrefixedParser[+T] extends Parser[T] { self => */ object PrefixedParser { - import cats.syntax.all._ + import cats.syntax.all.* /** Creates a new parser that is only triggered when a character in the specified * set is seen on the input. @@ -128,7 +128,7 @@ object PrefixedParser { * is seen on the input. */ def apply[U](char: Char, chars: Char*)(p: Parser[U]): PrefixedParser[U] = new PrefixedParser[U] { - def startChars: NonEmptySet[Char] = NonEmptySet.of(char, chars: _*) + def startChars: NonEmptySet[Char] = NonEmptySet.of(char, chars*) override def underlying = p } diff --git a/core/shared/src/main/scala/laika/parse/text/TextParsers.scala b/core/shared/src/main/scala/laika/parse/text/TextParsers.scala index 97f0f20a9..4aa873601 100644 --- a/core/shared/src/main/scala/laika/parse/text/TextParsers.scala +++ b/core/shared/src/main/scala/laika/parse/text/TextParsers.scala @@ -38,7 +38,7 @@ trait TextParsers extends Parsers { */ def range(fromChar: Char, toChar: Char): NonEmptySet[Char] = { val range = if (fromChar > toChar) toChar to fromChar else fromChar to toChar - NonEmptySet.of(range.head, range.tail: _*) + NonEmptySet.of(range.head, range.tail*) } /** A parser that matches only the specified literal string. @@ -111,7 +111,7 @@ trait TextParsers extends Parsers { * Succeeds at the start of the input and does not consume any input * or produce a result when it succeeds. */ - def prevNot(char: Char, chars: Char*): Parser[Unit] = prevNot(NonEmptySet.of(char, chars: _*)) + def prevNot(char: Char, chars: Char*): Parser[Unit] = prevNot(NonEmptySet.of(char, chars*)) /** Verifies that the previous character is not one of those specified. * Succeeds at the start of the input and does not consume any input @@ -138,7 +138,7 @@ trait TextParsers extends Parsers { * Succeeds at the end of the input and does not consume any input * or produce a result when it succeeds. */ - def nextNot(char: Char, chars: Char*): Parser[Unit] = nextNot(NonEmptySet.of(char, chars: _*)) + def nextNot(char: Char, chars: Char*): Parser[Unit] = nextNot(NonEmptySet.of(char, chars*)) /** Verifies that the next character is not one of those specified. * Succeeds at the end of the input and does not consume any input @@ -165,7 +165,7 @@ trait TextParsers extends Parsers { * Fails at the start of the input and does not consume any input * or produce a result when it succeeds. */ - def prevIn(char: Char, chars: Char*): Parser[Unit] = prevIn(NonEmptySet.of(char, chars: _*)) + def prevIn(char: Char, chars: Char*): Parser[Unit] = prevIn(NonEmptySet.of(char, chars*)) /** Verifies that the previous character is one of those specified. * Fails at the start of the input and does not consume any input @@ -193,7 +193,7 @@ trait TextParsers extends Parsers { * Fails at the end of the input and does not consume any input * or produce a result when it succeeds. */ - def nextIn(char: Char, chars: Char*): Parser[Unit] = nextIn(NonEmptySet.of(char, chars: _*)) + def nextIn(char: Char, chars: Char*): Parser[Unit] = nextIn(NonEmptySet.of(char, chars*)) /** Verifies that the next character is one of those specified. * Fails at the end of the input and does not consume any input @@ -253,7 +253,7 @@ trait TextParsers extends Parsers { /** Consumes one character if it matches one of the specified characters, fails otherwise. */ def oneOf(char: Char, chars: Char*): PrefixedParser[String] = { - val startChars = NonEmptySet.of(char, chars: _*) + val startChars = NonEmptySet.of(char, chars*) new PrefixCharacters(anyOf(startChars).take(1), startChars) } @@ -283,7 +283,7 @@ trait TextParsers extends Parsers { * fails if the first character does not match. */ def someOf(char: Char, chars: Char*): PrefixCharacters[String] = { - val startChars = NonEmptySet.of(char, chars: _*) + val startChars = NonEmptySet.of(char, chars*) new PrefixCharacters(anyOf(startChars).min(1), startChars) } @@ -314,7 +314,7 @@ trait TextParsers extends Parsers { * is encountered on the input string. */ def delimitedBy(char: Char, chars: Char*): DelimitedText = new DelimitedText( - TextDelimiter(oneOf(char, chars: _*)) + TextDelimiter(oneOf(char, chars*)) ) /** Consumes any number of consecutive characters until one of the specified characters @@ -348,7 +348,7 @@ trait TextParsers extends Parsers { * preceding or following the delimiter, a common task in markup parsing. */ def delimiter(char: Char, chars: Char*): DelimiterParser = new DelimiterParser( - oneOf(char, chars: _*) + oneOf(char, chars*) ) /** Creates a parser for a delimiter based on a literal string with an API that diff --git a/core/shared/src/test/scala/laika/api/RenderPhaseRewrite.scala b/core/shared/src/test/scala/laika/api/RenderPhaseRewrite.scala index 3ba86d7ed..d49c0e2d2 100644 --- a/core/shared/src/test/scala/laika/api/RenderPhaseRewrite.scala +++ b/core/shared/src/test/scala/laika/api/RenderPhaseRewrite.scala @@ -8,15 +8,15 @@ import laika.ast.{ Document, RewritePhase } trait RenderPhaseRewrite { - def rewrite(format: RenderFormat[_])(doc: Document): Either[RendererError, Document] = + def rewrite(format: RenderFormat[?])(doc: Document): Either[RendererError, Document] = rewrite(OperationConfig.default, format)(doc) - def rewrite(parser: MarkupParser, format: RenderFormat[_])( + def rewrite(parser: MarkupParser, format: RenderFormat[?])( doc: Document ): Either[RendererError, Document] = rewrite(parser.config, format)(doc) - def rewrite(config: OperationConfig, format: RenderFormat[_])( + def rewrite(config: OperationConfig, format: RenderFormat[?])( doc: Document ): Either[RendererError, Document] = { config diff --git a/core/shared/src/test/scala/laika/api/TransformAPISpec.scala b/core/shared/src/test/scala/laika/api/TransformAPISpec.scala index c4b440f66..6eeab4df1 100644 --- a/core/shared/src/test/scala/laika/api/TransformAPISpec.scala +++ b/core/shared/src/test/scala/laika/api/TransformAPISpec.scala @@ -16,10 +16,10 @@ package laika.api -import laika.ast._ +import laika.ast.* import laika.ast.RewriteAction.Replace import laika.config.LaikaKeys -import laika.format._ +import laika.format.* import munit.FunSuite class TransformAPISpec extends FunSuite { diff --git a/core/shared/src/test/scala/laika/ast/PathAPISpec.scala b/core/shared/src/test/scala/laika/ast/PathAPISpec.scala index 978fe3184..ebd15647a 100644 --- a/core/shared/src/test/scala/laika/ast/PathAPISpec.scala +++ b/core/shared/src/test/scala/laika/ast/PathAPISpec.scala @@ -16,7 +16,7 @@ package laika.ast -import laika.ast.Path._ +import laika.ast.Path.* import laika.ast.RelativePath.{ CurrentDocument, CurrentTree, Parent } import munit.{ FunSuite, Location } diff --git a/core/shared/src/test/scala/laika/ast/sample/ParagraphCompanionShortcuts.scala b/core/shared/src/test/scala/laika/ast/sample/ParagraphCompanionShortcuts.scala index 80dd4ad7d..4380af4a0 100644 --- a/core/shared/src/test/scala/laika/ast/sample/ParagraphCompanionShortcuts.scala +++ b/core/shared/src/test/scala/laika/ast/sample/ParagraphCompanionShortcuts.scala @@ -16,7 +16,7 @@ package laika.ast.sample -import laika.ast._ +import laika.ast.* trait ParagraphCompanionShortcuts { self => diff --git a/core/shared/src/test/scala/laika/ast/sample/TestSourceBuilders.scala b/core/shared/src/test/scala/laika/ast/sample/TestSourceBuilders.scala index 1fd325872..a4f061fe7 100644 --- a/core/shared/src/test/scala/laika/ast/sample/TestSourceBuilders.scala +++ b/core/shared/src/test/scala/laika/ast/sample/TestSourceBuilders.scala @@ -17,7 +17,7 @@ package laika.ast.sample import laika.ast.Path.Root -import laika.ast._ +import laika.ast.* import laika.parse.{ LineSource, SourceCursor, SourceFragment } /** @author Jens Halm diff --git a/core/shared/src/test/scala/laika/config/ConfigCodecSpec.scala b/core/shared/src/test/scala/laika/config/ConfigCodecSpec.scala index c9a021ab7..cee76febd 100644 --- a/core/shared/src/test/scala/laika/config/ConfigCodecSpec.scala +++ b/core/shared/src/test/scala/laika/config/ConfigCodecSpec.scala @@ -75,9 +75,9 @@ class ConfigCodecSpec extends FunSuite { object links { def sort(config: LinkConfig): LinkConfig = LinkConfig.empty - .addTargets(config.targets.sortBy(_.id) *) - .addApiLinks(config.apiLinks *) - .addSourceLinks(config.sourceLinks *) + .addTargets(config.targets.sortBy(_.id)*) + .addApiLinks(config.apiLinks*) + .addSourceLinks(config.sourceLinks*) val fullyPopulatedInstance = LinkConfig.empty .addTargets( diff --git a/core/shared/src/test/scala/laika/directive/BlockDirectiveAPISpec.scala b/core/shared/src/test/scala/laika/directive/BlockDirectiveAPISpec.scala index 4ca46ca1a..02b9b9e7b 100644 --- a/core/shared/src/test/scala/laika/directive/BlockDirectiveAPISpec.scala +++ b/core/shared/src/test/scala/laika/directive/BlockDirectiveAPISpec.scala @@ -36,7 +36,7 @@ class BlockDirectiveAPISpec extends FunSuite with TestSourceBuilders { object DirectiveSetup { - import laika.api.bundle.BlockDirectives.dsl._ + import laika.api.bundle.BlockDirectives.dsl.* trait Empty { val directive = BlockDirectives.create("dir")(BlockDirectives.dsl.empty(p("foo"))) @@ -128,8 +128,8 @@ class BlockDirectiveAPISpec extends FunSuite trait DirectiveWithCustomBodyParser { - import laika.parse.builders._ - import laika.parse.syntax._ + import laika.parse.builders.* + import laika.parse.syntax.* val directive = BlockDirectives.create("dir") { parsedBody(recParsers => @@ -204,7 +204,7 @@ class BlockDirectiveAPISpec extends FunSuite } - import DirectiveSetup._ + import DirectiveSetup.* test("empty directive") { new BlockParser with Empty { diff --git a/core/shared/src/test/scala/laika/directive/SpanDirectiveAPISpec.scala b/core/shared/src/test/scala/laika/directive/SpanDirectiveAPISpec.scala index 23001eece..0e1ca6708 100644 --- a/core/shared/src/test/scala/laika/directive/SpanDirectiveAPISpec.scala +++ b/core/shared/src/test/scala/laika/directive/SpanDirectiveAPISpec.scala @@ -43,7 +43,7 @@ import scala.util.Try class SpanDirectiveAPISpec extends FunSuite with TestSourceBuilders with RenderPhaseRewrite { object DirectiveSetup { - import laika.api.bundle.SpanDirectives.dsl._ + import laika.api.bundle.SpanDirectives.dsl.* trait Empty { val directive = SpanDirectives.create("dir")(SpanDirectives.dsl.empty(Text("foo"))) @@ -135,8 +135,8 @@ class SpanDirectiveAPISpec extends FunSuite with TestSourceBuilders with RenderP trait DirectiveWithCustomBodyParser { - import laika.parse.builders._ - import laika.parse.syntax._ + import laika.parse.builders.* + import laika.parse.syntax.* val directive = SpanDirectives.create("dir") { parsedBody(recParsers => anyChars.take(3) ~> recParsers.recursiveSpans(anyChars.line)) @@ -253,7 +253,7 @@ class SpanDirectiveAPISpec extends FunSuite with TestSourceBuilders with RenderP } - import DirectiveSetup._ + import DirectiveSetup.* test("empty directive") { new SpanParser with Empty { diff --git a/core/shared/src/test/scala/laika/directive/TemplateDirectiveAPISpec.scala b/core/shared/src/test/scala/laika/directive/TemplateDirectiveAPISpec.scala index 7b0c95352..f7ef37f8a 100644 --- a/core/shared/src/test/scala/laika/directive/TemplateDirectiveAPISpec.scala +++ b/core/shared/src/test/scala/laika/directive/TemplateDirectiveAPISpec.scala @@ -36,7 +36,7 @@ class TemplateDirectiveAPISpec extends FunSuite with TestSourceBuilders { ) object DirectiveSetup { - import laika.api.bundle.TemplateDirectives.dsl._ + import laika.api.bundle.TemplateDirectives.dsl.* trait Empty { @@ -143,8 +143,8 @@ class TemplateDirectiveAPISpec extends FunSuite with TestSourceBuilders { trait DirectiveWithCustomBodyParser { - import laika.parse.builders._ - import laika.parse.syntax._ + import laika.parse.builders.* + import laika.parse.syntax.* val directive = TemplateDirectives.create("dir") { parsedBody(recParsers => anyChars.take(3) ~> recParsers.recursiveSpans(anyChars.line)) @@ -211,7 +211,7 @@ class TemplateDirectiveAPISpec extends FunSuite with TestSourceBuilders { } - import DirectiveSetup._ + import DirectiveSetup.* test("parse an empty directive") { new Empty with TemplateParser { diff --git a/core/shared/src/test/scala/laika/directive/std/LinkDirectiveSpec.scala b/core/shared/src/test/scala/laika/directive/std/LinkDirectiveSpec.scala index 1bb4cb908..e4dd3ae61 100644 --- a/core/shared/src/test/scala/laika/directive/std/LinkDirectiveSpec.scala +++ b/core/shared/src/test/scala/laika/directive/std/LinkDirectiveSpec.scala @@ -69,7 +69,7 @@ class LinkDirectiveSpec extends FunSuite with ParagraphCompanionShortcuts with T |bb""".stripMargin assertEquals( parse(configInput(input)).map(_.content), - Right(RootElement(p("aa"), p(expected: _*), p("bb"))) + Right(RootElement(p("aa"), p(expected*), p("bb"))) ) } diff --git a/core/shared/src/test/scala/laika/directive/std/NavigationDirectiveSpec.scala b/core/shared/src/test/scala/laika/directive/std/NavigationDirectiveSpec.scala index 45b841c58..e0b28859d 100644 --- a/core/shared/src/test/scala/laika/directive/std/NavigationDirectiveSpec.scala +++ b/core/shared/src/test/scala/laika/directive/std/NavigationDirectiveSpec.scala @@ -164,7 +164,7 @@ class NavigationDirectiveSpec extends FunSuite with ParagraphCompanionShortcuts } - import NavModel._ + import NavModel.* val defaultNavOptions: NavOptions = NavOptions() @@ -189,7 +189,7 @@ class NavigationDirectiveSpec extends FunSuite with ParagraphCompanionShortcuts ) assertEquals( res, - Right(NavModel.blockResult(expectedNav: _*)(options)) + Right(NavModel.blockResult(expectedNav*)(options)) ) } @@ -201,7 +201,7 @@ class NavigationDirectiveSpec extends FunSuite with ParagraphCompanionShortcuts includeTargetFormatConfig = options.includeTargetFormatConfig, additionalDocuments = options.additionalDocuments ), - Right(NavModel.templateResult(expectedNav: _*)(options)) + Right(NavModel.templateResult(expectedNav*)(options)) ) def runTemplateError(input: String, directive: String, expectedMessage: String): Unit = @@ -379,7 +379,7 @@ class NavigationDirectiveSpec extends FunSuite with ParagraphCompanionShortcuts | ] |} bbb ${cursor.currentDocument.content}""".stripMargin - runTemplate(template, treeList(2, 5, 0).content: _*) + runTemplate(template, treeList(2, 5, 0).content*) } test("template nav - an entry generated from the current tree with the self link excluded") { diff --git a/core/shared/src/test/scala/laika/directive/std/RewriteSetup.scala b/core/shared/src/test/scala/laika/directive/std/RewriteSetup.scala index ee79cef3e..940bdbbb3 100644 --- a/core/shared/src/test/scala/laika/directive/std/RewriteSetup.scala +++ b/core/shared/src/test/scala/laika/directive/std/RewriteSetup.scala @@ -55,7 +55,7 @@ object RewriteSetup extends TemplateParserSetup with MarkupParserSetup with Asse val docContent = docUnderTest.getOrElse(SampleContent.fourSections(BuilderKey.Doc(6))) val builder = SampleTrees.sixDocuments.builder - .titleDocuments(titleDocPaths *) + .titleDocuments(titleDocPaths*) .docContent(SampleContent.fourSections) .docContent(targetPath, docContent) .docConfig(targetPath, docConfigUnderTest) diff --git a/core/shared/src/test/scala/laika/directive/std/StandardDirectiveSpec.scala b/core/shared/src/test/scala/laika/directive/std/StandardDirectiveSpec.scala index b41cdccf4..383f9f68f 100644 --- a/core/shared/src/test/scala/laika/directive/std/StandardDirectiveSpec.scala +++ b/core/shared/src/test/scala/laika/directive/std/StandardDirectiveSpec.scala @@ -18,7 +18,7 @@ package laika.directive.std import cats.data.NonEmptySet import laika.api.config.{ Config, ConfigBuilder } -import laika.ast._ +import laika.ast.* import laika.ast.sample.{ ParagraphCompanionShortcuts, TestSourceBuilders } import laika.config.IconRegistry import munit.FunSuite diff --git a/core/shared/src/test/scala/laika/internal/rst/APISpec.scala b/core/shared/src/test/scala/laika/internal/rst/APISpec.scala index 9bd4b8409..9aedaeb41 100644 --- a/core/shared/src/test/scala/laika/internal/rst/APISpec.scala +++ b/core/shared/src/test/scala/laika/internal/rst/APISpec.scala @@ -17,16 +17,16 @@ package laika.internal.rst import cats.syntax.all.* -import laika.api._ +import laika.api.* import laika.api.bundle.{ BlockDirectives, DirectiveRegistry, SpanDirectives } -import laika.ast._ +import laika.ast.* import laika.ast.sample.ParagraphCompanionShortcuts import laika.format.{ AST, ReStructuredText } import laika.parse.builders.~ -import laika.internal.rst.ext.Directives.Parts._ -import laika.internal.rst.ext.Directives._ +import laika.internal.rst.ext.Directives.Parts.* +import laika.internal.rst.ext.Directives.* import laika.internal.rst.ext.ExtensionProvider -import laika.internal.rst.ext.TextRoles._ +import laika.internal.rst.ext.TextRoles.* import munit.FunSuite class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhaseRewrite { @@ -76,7 +76,7 @@ class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhase } test("registration of text roles") { - import laika.internal.rst.ext.TextRoles.{ Parts => P } + import laika.internal.rst.ext.TextRoles.Parts as P val roles = List( TextRole("oneArg", "foo1")(P.field("name")) { (res, text) => Text(res + text) @@ -105,7 +105,7 @@ class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhase } object BlockTestDirectives { - import BlockDirectives.dsl._ + import BlockDirectives.dsl.* object Registry extends DirectiveRegistry { @@ -126,7 +126,7 @@ class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhase } object SpanTestDirectives { - import SpanDirectives.dsl._ + import SpanDirectives.dsl.* object Registry extends DirectiveRegistry { diff --git a/core/shared/src/test/scala/laika/internal/rst/ExplicitBlockParsersSpec.scala b/core/shared/src/test/scala/laika/internal/rst/ExplicitBlockParsersSpec.scala index b2b0e8f37..c5d016dcb 100644 --- a/core/shared/src/test/scala/laika/internal/rst/ExplicitBlockParsersSpec.scala +++ b/core/shared/src/test/scala/laika/internal/rst/ExplicitBlockParsersSpec.scala @@ -17,7 +17,7 @@ package laika.internal.rst import laika.api.builder.OperationConfig -import laika.ast._ +import laika.ast.* import laika.ast.sample.{ ParagraphCompanionShortcuts, TestSourceBuilders } import laika.format.ReStructuredText import laika.internal.parse.markup.RootParser diff --git a/core/shared/src/test/scala/laika/internal/rst/ListParsersSpec.scala b/core/shared/src/test/scala/laika/internal/rst/ListParsersSpec.scala index 9f4cf0b0d..6a2bfabd5 100644 --- a/core/shared/src/test/scala/laika/internal/rst/ListParsersSpec.scala +++ b/core/shared/src/test/scala/laika/internal/rst/ListParsersSpec.scala @@ -132,7 +132,7 @@ class BulletListSpec extends FunSuite with ListParserRunner { class EnumListSpec extends FunSuite with ListParserRunner { - import EnumType._ + import EnumType.* test("arabic enumeration style") { val input = diff --git a/core/shared/src/test/scala/laika/internal/rst/bundle/ExtendedHTMLRendererSpec.scala b/core/shared/src/test/scala/laika/internal/rst/bundle/ExtendedHTMLRendererSpec.scala index 94af630ce..6229e145a 100644 --- a/core/shared/src/test/scala/laika/internal/rst/bundle/ExtendedHTMLRendererSpec.scala +++ b/core/shared/src/test/scala/laika/internal/rst/bundle/ExtendedHTMLRendererSpec.scala @@ -37,7 +37,7 @@ import munit.FunSuite class ExtendedHTMLRendererSpec extends FunSuite with ParagraphCompanionShortcuts { def render(elem: Element): Either[RendererError, String] = - Renderer.of(HTML).using(ReStructuredText.extensions: _*).build.render(elem) + Renderer.of(HTML).using(ReStructuredText.extensions*).build.render(elem) test("render a doctest block") { val elem = DoctestBlock("some text") diff --git a/core/shared/src/test/scala/laika/internal/rst/std/StandardBlockDirectivesSpec.scala b/core/shared/src/test/scala/laika/internal/rst/std/StandardBlockDirectivesSpec.scala index 0cb84e1d4..46e901bfb 100644 --- a/core/shared/src/test/scala/laika/internal/rst/std/StandardBlockDirectivesSpec.scala +++ b/core/shared/src/test/scala/laika/internal/rst/std/StandardBlockDirectivesSpec.scala @@ -112,7 +112,7 @@ class StandardBlockDirectivesSpec extends FunSuite with ParagraphCompanionShortc | 1st Para | | 2nd Para""".stripMargin - run(input, simplePars *) + run(input, simplePars*) } test("container - sequence of two paragraphs with two custom styles") { diff --git a/core/shared/src/test/scala/laika/markdown/APISpec.scala b/core/shared/src/test/scala/laika/markdown/APISpec.scala index 2620e592a..e46b4350d 100644 --- a/core/shared/src/test/scala/laika/markdown/APISpec.scala +++ b/core/shared/src/test/scala/laika/markdown/APISpec.scala @@ -29,7 +29,7 @@ class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhase object BlockTestDirectives { import laika.api.bundle.BlockDirectives - import BlockDirectives.dsl._ + import BlockDirectives.dsl.* object Registry extends DirectiveRegistry { @@ -71,7 +71,7 @@ class APISpec extends FunSuite with ParagraphCompanionShortcuts with RenderPhase object SpanTestDirectives { import laika.api.bundle.SpanDirectives - import SpanDirectives.dsl._ + import SpanDirectives.dsl.* object Registry extends DirectiveRegistry { diff --git a/core/shared/src/test/scala/laika/markdown/BlockParsersSpec.scala b/core/shared/src/test/scala/laika/markdown/BlockParsersSpec.scala index 234c4e403..ff72a97e6 100644 --- a/core/shared/src/test/scala/laika/markdown/BlockParsersSpec.scala +++ b/core/shared/src/test/scala/laika/markdown/BlockParsersSpec.scala @@ -17,7 +17,7 @@ package laika.markdown import laika.api.builder.OperationConfig -import laika.ast._ +import laika.ast.* import laika.ast.sample.ParagraphCompanionShortcuts import laika.format.Markdown import laika.internal.parse.markup.RootParser diff --git a/core/shared/src/test/scala/laika/markdown/GitHubFlavorSpec.scala b/core/shared/src/test/scala/laika/markdown/GitHubFlavorSpec.scala index 8a90387e4..f52dee7d1 100644 --- a/core/shared/src/test/scala/laika/markdown/GitHubFlavorSpec.scala +++ b/core/shared/src/test/scala/laika/markdown/GitHubFlavorSpec.scala @@ -41,7 +41,7 @@ class GitHubFlavorSpec extends FunSuite with ParagraphCompanionShortcuts { Row(cells.map(c => CellType.BodyCell(c))) def paddedBodyRow(count: Int, cells: String*): Row = { - val cellsWithText = bodyRow(cells *).content + val cellsWithText = bodyRow(cells*).content Row(cellsWithText.padTo(count, CellType.BodyCell.empty)) } diff --git a/core/shared/src/test/scala/laika/markdown/HTMLModelBuilder.scala b/core/shared/src/test/scala/laika/markdown/HTMLModelBuilder.scala index e5f13faf0..a65af59a5 100644 --- a/core/shared/src/test/scala/laika/markdown/HTMLModelBuilder.scala +++ b/core/shared/src/test/scala/laika/markdown/HTMLModelBuilder.scala @@ -25,10 +25,10 @@ trait HTMLModelBuilder { attributes.toList map (a => HTMLAttribute(a._1, List(a._2), Some('\"'))) def emptyTag(name: String, attributes: (String, Span with TextContainer)*): HTMLEmptyElement = - html.HTMLEmptyElement(name, toAttributes(attributes: _*)) + html.HTMLEmptyElement(name, toAttributes(attributes*)) def startTag(name: String, attributes: (String, Span with TextContainer)*): HTMLStartTag = - html.HTMLStartTag(name, toAttributes(attributes: _*)) + html.HTMLStartTag(name, toAttributes(attributes*)) def startTag(name: String, attribute: HTMLAttribute): HTMLStartTag = HTMLStartTag(name, List(attribute)) diff --git a/core/shared/src/test/scala/laika/markdown/InlineParsersSpec.scala b/core/shared/src/test/scala/laika/markdown/InlineParsersSpec.scala index 1d827ca66..b4bd5fc39 100644 --- a/core/shared/src/test/scala/laika/markdown/InlineParsersSpec.scala +++ b/core/shared/src/test/scala/laika/markdown/InlineParsersSpec.scala @@ -17,7 +17,7 @@ package laika.markdown import laika.api.builder.OperationConfig -import laika.ast._ +import laika.ast.* import laika.ast.sample.TestSourceBuilders import laika.format.Markdown import laika.parse.Parser diff --git a/core/shared/src/test/scala/laika/parse/ParserSpec.scala b/core/shared/src/test/scala/laika/parse/ParserSpec.scala index 3119ff0cb..781d5b383 100644 --- a/core/shared/src/test/scala/laika/parse/ParserSpec.scala +++ b/core/shared/src/test/scala/laika/parse/ParserSpec.scala @@ -18,7 +18,7 @@ package laika.parse import laika.parse.builders.~ import laika.parse.combinator.Parsers -import laika.parse.combinator.Parsers._ +import laika.parse.combinator.Parsers.* import laika.parse.text.TextParsers import munit.FunSuite @@ -239,7 +239,7 @@ class ParserSpec extends FunSuite { object RepWith { - import TextParsers._ + import TextParsers.* val parser: Parser[List[String]] = literal("1").repWith { (res: String) => literal((res.toInt + 1).toString) @@ -304,20 +304,20 @@ class ParserSpec extends FunSuite { } test("source parser produces the consumed string as a result") { - import TextParsers._ + import TextParsers.* val p = anyOf('a') ~ opt(oneOf('d')) ~ oneOf('b').rep run(p.source, "aabbcc", "aabb") } test("count parser produces the length of the consumed string as a result") { - import TextParsers._ + import TextParsers.* val p = anyOf('a') ~ opt(TextParsers.oneOf('d')) ~ TextParsers.oneOf('b').rep run(p.count, "aabbcc", 4) } object MaxOffset { - def validate(res: Parsed[_], expectedMaxOffset: Int): Unit = { + def validate(res: Parsed[?], expectedMaxOffset: Int): Unit = { assert(res.isFailure) assertEquals(res.asInstanceOf[Failure].maxOffset, expectedMaxOffset) } diff --git a/core/shared/src/test/scala/laika/parse/code/languages/LanguageSpec.scala b/core/shared/src/test/scala/laika/parse/code/languages/LanguageSpec.scala index bd3260838..c0e4c41a6 100644 --- a/core/shared/src/test/scala/laika/parse/code/languages/LanguageSpec.scala +++ b/core/shared/src/test/scala/laika/parse/code/languages/LanguageSpec.scala @@ -519,7 +519,7 @@ class LanguageSpec extends FunSuite { |} |```""".stripMargin - import TagFormats._ + import TagFormats.* val expected = result( "jsx", keyword("class"), @@ -1068,7 +1068,7 @@ class LanguageSpec extends FunSuite { |``` """.stripMargin - import TagFormats._ + import TagFormats.* val expected = result( "tsx", keyword("import"), @@ -1307,7 +1307,7 @@ class LanguageSpec extends FunSuite { |``` """.stripMargin - import TagFormats._ + import TagFormats.* val expected = result( "xml", punct(">>" <~ ws.min(1)), "123>>> ", "123") } test("delimitedBy - fail when the specified post condition is not met") { - import laika.parse.syntax._ + import laika.parse.syntax.* expectFailure(delimitedBy(">>>" <~ ws.min(1)), "123>>>A") } diff --git a/core/shared/src/test/scala/laika/rewrite/RewriteRulesSpec.scala b/core/shared/src/test/scala/laika/rewrite/RewriteRulesSpec.scala index 0bddd45df..c1d2a2418 100644 --- a/core/shared/src/test/scala/laika/rewrite/RewriteRulesSpec.scala +++ b/core/shared/src/test/scala/laika/rewrite/RewriteRulesSpec.scala @@ -59,7 +59,7 @@ class RewriteRulesSpec extends FunSuite with ParagraphCompanionShortcuts with Te def fnLinks(labels: (String, String)*): Paragraph = p(labels.map { label => FootnoteLink(label._1, label._2) - }: _*) + }*) def fn(label: FootnoteLabel, num: Any) = FootnoteDefinition(label, List(p(s"footnote$num")), SourceCursor.Generated) diff --git a/core/shared/src/test/scala/laika/rewrite/RewriteSpec.scala b/core/shared/src/test/scala/laika/rewrite/RewriteSpec.scala index 2a051bc78..948639704 100644 --- a/core/shared/src/test/scala/laika/rewrite/RewriteSpec.scala +++ b/core/shared/src/test/scala/laika/rewrite/RewriteSpec.scala @@ -16,7 +16,7 @@ package laika.rewrite -import laika.ast._ +import laika.ast.* import laika.ast.CellType.BodyCell import laika.ast.RewriteAction.Replace import laika.ast.sample.ParagraphCompanionShortcuts diff --git a/io/src/main/scala/laika/helium/config/ThemeLink.scala b/io/src/main/scala/laika/helium/config/ThemeLink.scala index a0942efa9..cdf87e0b6 100644 --- a/io/src/main/scala/laika/helium/config/ThemeLink.scala +++ b/io/src/main/scala/laika/helium/config/ThemeLink.scala @@ -334,6 +334,6 @@ object ThemeNavigationSection { } def apply(title: String, link: TextLink, links: TextLink*): ThemeNavigationSection = - Impl(title, NonEmptyList.of(link, links *)) + Impl(title, NonEmptyList.of(link, links*)) } diff --git a/io/src/main/scala/laika/helium/config/api.scala b/io/src/main/scala/laika/helium/config/api.scala index c1365ca2e..6ddc4f8b1 100644 --- a/io/src/main/scala/laika/helium/config/api.scala +++ b/io/src/main/scala/laika/helium/config/api.scala @@ -274,7 +274,7 @@ private[helium] trait SingleConfigOps extends CommonConfigOps with ColorOps { populate(version)(_.withVersion(_)) ).reduce(_.andThen(_)) withMetadata( - functions(currentMetadata.addAuthors(authors *)) + functions(currentMetadata.addAuthors(authors*)) ) } @@ -286,7 +286,7 @@ private[helium] trait AllFormatsOps extends CommonConfigOps { private val formats: Seq[Helium => CommonConfigOps] = Seq(_.site, _.epub, _.pdf) def addFontResources(defn: FontDefinition*): Helium = formats.foldLeft(helium) { - case (helium, format) => format(helium).addFontResources(defn *) + case (helium, format) => format(helium).addFontResources(defn*) } def clearFontResources: Helium = formats.foldLeft(helium) { case (helium, format) => @@ -879,7 +879,7 @@ private[helium] trait EPUBOps extends SingleConfigOps with CopyOps { def addFontResources(defn: FontDefinition*): Helium = copyWith( - helium.epubSettings.copy(bookConfig = helium.epubSettings.bookConfig.addFonts(defn *)) + helium.epubSettings.copy(bookConfig = helium.epubSettings.bookConfig.addFonts(defn*)) ) def clearFontResources: Helium = copyWith( @@ -1053,7 +1053,7 @@ private[helium] trait PDFOps extends SingleConfigOps with CopyOps { protected def currentColors: ColorSet = helium.pdfSettings.colors def addFontResources(defn: FontDefinition*): Helium = - copyWith(helium.pdfSettings.copy(bookConfig = helium.pdfSettings.bookConfig.addFonts(defn *))) + copyWith(helium.pdfSettings.copy(bookConfig = helium.pdfSettings.bookConfig.addFonts(defn*))) def clearFontResources: Helium = copyWith( helium.pdfSettings.copy(bookConfig = helium.pdfSettings.bookConfig.clearFonts) diff --git a/io/src/main/scala/laika/helium/internal/builder/HeliumDirectives.scala b/io/src/main/scala/laika/helium/internal/builder/HeliumDirectives.scala index 48ba26058..4e5ba21f6 100644 --- a/io/src/main/scala/laika/helium/internal/builder/HeliumDirectives.scala +++ b/io/src/main/scala/laika/helium/internal/builder/HeliumDirectives.scala @@ -52,7 +52,7 @@ private[helium] object HeliumDirectives { } val initPreview: TemplateDirectives.Directive = TemplateDirectives.eval("heliumInitPreview") { - import TemplateDirectives.dsl._ + import TemplateDirectives.dsl.* (positionalAttributes.as[String].widen, cursor).mapN { (targetIds, cursor) => val res = for { enabled <- cursor.config.get(LaikaKeys.preview.enabled, false) diff --git a/io/src/main/scala/laika/helium/internal/builder/HeliumInputBuilder.scala b/io/src/main/scala/laika/helium/internal/builder/HeliumInputBuilder.scala index 35bc47308..e25ed047e 100644 --- a/io/src/main/scala/laika/helium/internal/builder/HeliumInputBuilder.scala +++ b/io/src/main/scala/laika/helium/internal/builder/HeliumInputBuilder.scala @@ -45,7 +45,7 @@ private[helium] object HeliumInputBuilder { def build[F[_]: Async](helium: Helium): F[InputTreeBuilder[F]] = { - import helium._ + import helium.* val fontResources = (siteSettings.fontResources ++ epubSettings.bookConfig.fonts ++ pdfSettings.bookConfig.fonts) diff --git a/io/src/main/scala/laika/helium/internal/builder/HeliumThemeBuilder.scala b/io/src/main/scala/laika/helium/internal/builder/HeliumThemeBuilder.scala index 22833525d..2d151b5d7 100644 --- a/io/src/main/scala/laika/helium/internal/builder/HeliumThemeBuilder.scala +++ b/io/src/main/scala/laika/helium/internal/builder/HeliumThemeBuilder.scala @@ -55,7 +55,7 @@ private[helium] class HeliumThemeBuilder(helium: Helium) extends ThemeProvider { def build[F[_]: Async]: Resource[F, Theme[F]] = { - import helium._ + import helium.* val treeProcessor = new HeliumTreeProcessor[F](helium) diff --git a/io/src/main/scala/laika/helium/internal/config/HeliumDefaults.scala b/io/src/main/scala/laika/helium/internal/config/HeliumDefaults.scala index 44e8cae5a..7637b2f81 100644 --- a/io/src/main/scala/laika/helium/internal/config/HeliumDefaults.scala +++ b/io/src/main/scala/laika/helium/internal/config/HeliumDefaults.scala @@ -185,7 +185,7 @@ private[helium] object HeliumDefaults { private val defaultEPUBSettings = EPUBSettings( bookConfig = BookConfig.empty - .addFonts(defaultFonts *) + .addFonts(defaultFonts*) .withNavigationDepth( 2 // chosen as default as iBooks messes with the hierarchy of entries when using more than 2 levels ), @@ -210,7 +210,7 @@ private[helium] object HeliumDefaults { ) private val defaultPDFSettings = PDFSettings( - bookConfig = BookConfig.empty.addFonts(defaultFonts *), + bookConfig = BookConfig.empty.addFonts(defaultFonts*), themeFonts = defaultThemeFonts, fontSizes = FontSizes( body = pt(10), diff --git a/io/src/main/scala/laika/helium/internal/config/layout.scala b/io/src/main/scala/laika/helium/internal/config/layout.scala index 0979bdbe3..7eff78deb 100644 --- a/io/src/main/scala/laika/helium/internal/config/layout.scala +++ b/io/src/main/scala/laika/helium/internal/config/layout.scala @@ -115,7 +115,7 @@ private[helium] case class LandingPage( teasers: Seq[Teaser] = Nil ) { - import LengthUnit._ + import LengthUnit.* val subtitleFontSize: Length = if (subtitle.exists(_.length > 75)) px(22) diff --git a/io/src/main/scala/laika/helium/internal/generate/CSSVarGenerator.scala b/io/src/main/scala/laika/helium/internal/generate/CSSVarGenerator.scala index 4959c7b0f..39f5cb1e2 100644 --- a/io/src/main/scala/laika/helium/internal/generate/CSSVarGenerator.scala +++ b/io/src/main/scala/laika/helium/internal/generate/CSSVarGenerator.scala @@ -115,7 +115,7 @@ private[helium] object CSSVarGenerator { private def ref(name: String): String = s"var(--$name)" def colorSet(colors: ColorSet, darkMode: Boolean): Seq[(String, String)] = { - import colors._ + import colors.* Seq( "primary-color" -> theme.primary.displayValue, "primary-light" -> theme.primaryLight.displayValue, diff --git a/io/src/main/scala/laika/io/api/BinaryTreeRenderer.scala b/io/src/main/scala/laika/io/api/BinaryTreeRenderer.scala index 8e42c55ab..cac1e5ddb 100644 --- a/io/src/main/scala/laika/io/api/BinaryTreeRenderer.scala +++ b/io/src/main/scala/laika/io/api/BinaryTreeRenderer.scala @@ -76,7 +76,7 @@ object BinaryTreeRenderer { private[io] val description: String ) - type BinaryRenderFormat = TwoPhaseRenderFormat[_, BinaryPostProcessor.Builder] + type BinaryRenderFormat = TwoPhaseRenderFormat[?, BinaryPostProcessor.Builder] private[laika] def buildRenderer[F[_]: Async]( format: BinaryRenderFormat, diff --git a/io/src/main/scala/laika/io/descriptor/InputDescriptor.scala b/io/src/main/scala/laika/io/descriptor/InputDescriptor.scala index 07adb8520..a3db7b7ba 100644 --- a/io/src/main/scala/laika/io/descriptor/InputDescriptor.scala +++ b/io/src/main/scala/laika/io/descriptor/InputDescriptor.scala @@ -17,7 +17,7 @@ package laika.io.descriptor import laika.ast.DocumentType -import laika.internal.collection.TransitionalCollectionOps._ +import laika.internal.collection.TransitionalCollectionOps.* import laika.io.model.{ BinaryInput, FilePath, InputTree, TextInput } /** Describes a single, textual or binary input for a parsing or rendering operation. diff --git a/io/src/main/scala/laika/io/internal/runtime/ParserRuntime.scala b/io/src/main/scala/laika/io/internal/runtime/ParserRuntime.scala index c596a5fa1..2e1774f60 100644 --- a/io/src/main/scala/laika/io/internal/runtime/ParserRuntime.scala +++ b/io/src/main/scala/laika/io/internal/runtime/ParserRuntime.scala @@ -45,13 +45,13 @@ import laika.io.internal.errors.{ */ private[io] object ParserRuntime { - import DocumentTreeBuilder._ + import DocumentTreeBuilder.* /** Run the specified parser operation for an entire input tree, producing an AST tree. */ def run[F[_]: Async: Batch](op: TreeParser.Op[F]): F[ParsedTree[F]] = { - import DocumentType.{ Config => ConfigType, _ } + import DocumentType.{ Config as ConfigType, * } def mergeInputs(userInputs: InputTree[F], themeInputs: InputTree[F]): F[InputTree[F]] = { diff --git a/io/src/main/scala/laika/io/model/FilePath.scala b/io/src/main/scala/laika/io/model/FilePath.scala index 518cd866e..8e0a15393 100644 --- a/io/src/main/scala/laika/io/model/FilePath.scala +++ b/io/src/main/scala/laika/io/model/FilePath.scala @@ -96,7 +96,7 @@ class FilePath private (private val root: Option[String], private[FilePath] val case sp: Path.Segments => val last = sp.name + fragment.fold("")("#" + _) val segments = root.toList ++: sp.segments.init.append(last).toList - Paths.get(segments.head, segments.tail: _*) + Paths.get(segments.head, segments.tail*) } /** Converts this `FilePath` to an `fs2.io.file.Path`. diff --git a/io/src/main/scala/laika/io/model/InputTreeBuilder.scala b/io/src/main/scala/laika/io/model/InputTreeBuilder.scala index d9ab62ab4..774a425d6 100644 --- a/io/src/main/scala/laika/io/model/InputTreeBuilder.scala +++ b/io/src/main/scala/laika/io/model/InputTreeBuilder.scala @@ -94,8 +94,8 @@ class InputTreeBuilder[F[_]] private[model] ( private[laika] val fileRoots: Vector[FilePath] )(implicit F: Async[F]) { - import cats.syntax.all._ - import DocumentTreeBuilder._ + import cats.syntax.all.* + import DocumentTreeBuilder.* private def addStep(step: BuilderStep[F]): InputTreeBuilder[F] = addStep(None)(step) diff --git a/io/src/main/scala/laika/io/model/TextOutput.scala b/io/src/main/scala/laika/io/model/TextOutput.scala index 46a28fd94..1062423a4 100644 --- a/io/src/main/scala/laika/io/model/TextOutput.scala +++ b/io/src/main/scala/laika/io/model/TextOutput.scala @@ -20,7 +20,7 @@ import cats.Applicative import cats.effect.{ Async, Concurrent } import fs2.io.file.Files import laika.ast.Path.Root -import laika.ast._ +import laika.ast.* import java.io.OutputStream import scala.io.Codec diff --git a/io/src/main/scala/laika/io/syntax.scala b/io/src/main/scala/laika/io/syntax.scala index e10645c22..04b6c5615 100644 --- a/io/src/main/scala/laika/io/syntax.scala +++ b/io/src/main/scala/laika/io/syntax.scala @@ -77,7 +77,7 @@ object syntax { } - implicit class TextRendererSyntax(builder: RendererBuilder[_]) + implicit class TextRendererSyntax(builder: RendererBuilder[?]) extends IOBuilderOps[TreeRenderer.Builder] { protected def build[F[_]: Async: Batch]: TreeRenderer.Builder[F] = @@ -85,7 +85,7 @@ object syntax { } - implicit class TextTransformerSyntax(builder: TransformerBuilder[_]) + implicit class TextTransformerSyntax(builder: TransformerBuilder[?]) extends IOBuilderOps[TreeTransformer.Builder] { protected def build[F[_]: Async: Batch]: TreeTransformer.Builder[F] = { @@ -101,7 +101,7 @@ object syntax { } implicit class BinaryRendererSyntax( - builder: TwoPhaseRendererBuilder[_, BinaryPostProcessor.Builder] + builder: TwoPhaseRendererBuilder[?, BinaryPostProcessor.Builder] ) extends IOBuilderOps[BinaryTreeRenderer.Builder] { protected def build[F[_]: Async: Batch]: BinaryTreeRenderer.Builder[F] = { @@ -115,7 +115,7 @@ object syntax { } implicit class BinaryTransformerSyntax( - builder: TwoPhaseTransformerBuilder[_, BinaryPostProcessor.Builder] + builder: TwoPhaseTransformerBuilder[?, BinaryPostProcessor.Builder] ) extends IOBuilderOps[BinaryTreeTransformer.Builder] { protected def build[F[_]: Async: Batch]: BinaryTreeTransformer.Builder[F] = { diff --git a/io/src/test/scala/laika/epub/internal/BookConfigSpec.scala b/io/src/test/scala/laika/epub/internal/BookConfigSpec.scala index 594433967..13a27eafc 100644 --- a/io/src/test/scala/laika/epub/internal/BookConfigSpec.scala +++ b/io/src/test/scala/laika/epub/internal/BookConfigSpec.scala @@ -86,7 +86,7 @@ class BookConfigSpec extends FunSuite { .withDatePublished(PlatformDateTime.parse("2002-10-10T12:00:00").toOption.get) ) .withNavigationDepth(4) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") assertEquals(actual, Right(expected)) } @@ -95,7 +95,7 @@ class BookConfigSpec extends FunSuite { val input = BookConfig.empty .withMetadata(DocumentMetadata.empty.withIdentifier("XX-33-FF-01")) .withNavigationDepth(3) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") val encoded = ConfigBuilder.empty.withValue(testKey, input).build val actual = decode[BookConfig](encoded) diff --git a/io/src/test/scala/laika/epub/internal/InputTreeBuilder.scala b/io/src/test/scala/laika/epub/internal/InputTreeBuilder.scala index d835f3ffa..06472a84c 100644 --- a/io/src/test/scala/laika/epub/internal/InputTreeBuilder.scala +++ b/io/src/test/scala/laika/epub/internal/InputTreeBuilder.scala @@ -72,7 +72,7 @@ trait InputTreeBuilder extends InputBuilder { ): RenderedTreeRoot[IO] = { val outputContext = OutputContext(EPUB) // ignored new RenderedTreeRoot( - tree(path, titleNum, docs *), + tree(path, titleNum, docs*), DocumentTreeRoot(DocumentTree.empty), outputContext, PathTranslator.noOp, // not reflecting real result, but not part of any assertions diff --git a/io/src/test/scala/laika/helium/HeliumEPUBCSSSpec.scala b/io/src/test/scala/laika/helium/HeliumEPUBCSSSpec.scala index d0f445f8c..9aa984a87 100644 --- a/io/src/test/scala/laika/helium/HeliumEPUBCSSSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumEPUBCSSSpec.scala @@ -309,7 +309,7 @@ class HeliumEPUBCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt |--syntax-wheel5: #210055;""".stripMargin test("custom colors - via 'epub' selector") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = Helium.defaults .epub.themeColors( primary = rgb(1, 1, 1), @@ -338,7 +338,7 @@ class HeliumEPUBCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt } test("custom colors - via 'all' selector") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = Helium.defaults .all.themeColors( primary = rgb(1, 1, 1), @@ -367,7 +367,7 @@ class HeliumEPUBCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt } test("custom colors in dark mode") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = Helium.defaults .epub.themeColors( primary = rgb(1, 1, 1), diff --git a/io/src/test/scala/laika/helium/HeliumEPUBTocPageSpec.scala b/io/src/test/scala/laika/helium/HeliumEPUBTocPageSpec.scala index d110f1885..565b6600d 100644 --- a/io/src/test/scala/laika/helium/HeliumEPUBTocPageSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumEPUBTocPageSpec.scala @@ -24,8 +24,8 @@ import laika.ast.Path.Root import laika.format.{ EPUB, Markdown } import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ -import laika.theme._ +import laika.io.syntax.* +import laika.theme.* import munit.CatsEffectSuite class HeliumEPUBTocPageSpec extends CatsEffectSuite with InputBuilder with ResultExtractor diff --git a/io/src/test/scala/laika/helium/HeliumFORendererSpec.scala b/io/src/test/scala/laika/helium/HeliumFORendererSpec.scala index 885ac1682..1c24c1098 100644 --- a/io/src/test/scala/laika/helium/HeliumFORendererSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumFORendererSpec.scala @@ -18,7 +18,7 @@ package laika.helium import cats.effect.{ IO, Resource } import laika.api.Transformer -import laika.ast.LengthUnit._ +import laika.ast.LengthUnit.* import laika.ast.Path import laika.ast.Path.Root import laika.config.{ CoverImage, SyntaxHighlighting } @@ -26,7 +26,7 @@ import laika.format.{ Markdown, XSLFO } import laika.helium.config.ColorQuintet import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ +import laika.io.syntax.* import laika.theme.ThemeProvider import laika.theme.config.Color import munit.CatsEffectSuite @@ -232,7 +232,7 @@ class HeliumFORendererSpec extends CatsEffectSuite with InputBuilder with Result } test("custom color scheme for syntax highlighting") { - import Color._ + import Color.* val markup = """ |```scala diff --git a/io/src/test/scala/laika/helium/HeliumFOTocPageSpec.scala b/io/src/test/scala/laika/helium/HeliumFOTocPageSpec.scala index 69112d10a..496804424 100644 --- a/io/src/test/scala/laika/helium/HeliumFOTocPageSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumFOTocPageSpec.scala @@ -23,8 +23,8 @@ import laika.ast.Path.Root import laika.format.{ Markdown, XSLFO } import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ -import laika.theme._ +import laika.io.syntax.* +import laika.theme.* import munit.CatsEffectSuite class HeliumFOTocPageSpec extends CatsEffectSuite with InputBuilder with ResultExtractor diff --git a/io/src/test/scala/laika/helium/HeliumFooterSpec.scala b/io/src/test/scala/laika/helium/HeliumFooterSpec.scala index de63d1ed6..781e03500 100644 --- a/io/src/test/scala/laika/helium/HeliumFooterSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumFooterSpec.scala @@ -23,8 +23,8 @@ import laika.ast.Path.Root import laika.format.{ HTML, Markdown } import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ -import laika.theme._ +import laika.io.syntax.* +import laika.theme.* import munit.CatsEffectSuite class HeliumFooterSpec extends CatsEffectSuite with InputBuilder with ResultExtractor diff --git a/io/src/test/scala/laika/helium/HeliumHTMLHeadSpec.scala b/io/src/test/scala/laika/helium/HeliumHTMLHeadSpec.scala index 4ccf4a4d6..599bed3ab 100644 --- a/io/src/test/scala/laika/helium/HeliumHTMLHeadSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumHTMLHeadSpec.scala @@ -435,7 +435,7 @@ class HeliumHTMLHeadSpec extends CatsEffectSuite with InputBuilder with ResultEx } test("custom web fonts - added to default fonts") { - val helium = heliumBase.site.addFontResources(testFonts *) + val helium = heliumBase.site.addFontResources(testFonts*) val expected = meta ++ """ | @@ -451,7 +451,7 @@ class HeliumHTMLHeadSpec extends CatsEffectSuite with InputBuilder with ResultEx } test("custom web fonts - replacing default fonts") { - val helium = heliumBase.site.clearFontResources.site.addFontResources(testFonts *) + val helium = heliumBase.site.clearFontResources.site.addFontResources(testFonts*) val expected = meta ++ """ | diff --git a/io/src/test/scala/laika/helium/HeliumSiteCSSSpec.scala b/io/src/test/scala/laika/helium/HeliumSiteCSSSpec.scala index 526322eb0..28f4c20a4 100644 --- a/io/src/test/scala/laika/helium/HeliumSiteCSSSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumSiteCSSSpec.scala @@ -25,7 +25,7 @@ import laika.format.{ HTML, Markdown } import laika.helium.config.{ AnchorPlacement, ColorQuintet } import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ +import laika.io.syntax.* import laika.theme.ThemeProvider import munit.CatsEffectSuite @@ -261,7 +261,7 @@ class HeliumSiteCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt |$darkInverted""".stripMargin test("custom colors - via 'site' selector") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = heliumBase .site.themeColors( primary = rgb(1, 1, 1), @@ -291,7 +291,7 @@ class HeliumSiteCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt } test("custom colors - via 'all' selector") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = heliumBase .all.themeColors( primary = rgb(1, 1, 1), @@ -321,7 +321,7 @@ class HeliumSiteCSSSpec extends CatsEffectSuite with InputBuilder with ResultExt } test("custom colors in dark mode") { - import laika.theme.config.Color._ + import laika.theme.config.Color.* val helium = heliumBase .site.themeColors( primary = rgb(1, 1, 1), diff --git a/io/src/test/scala/laika/helium/HeliumTocPageSpec.scala b/io/src/test/scala/laika/helium/HeliumTocPageSpec.scala index c22c0ce5e..9fe5f6deb 100644 --- a/io/src/test/scala/laika/helium/HeliumTocPageSpec.scala +++ b/io/src/test/scala/laika/helium/HeliumTocPageSpec.scala @@ -24,8 +24,8 @@ import laika.ast.Path.Root import laika.format.{ HTML, Markdown } import laika.io.api.TreeTransformer import laika.io.helper.{ InputBuilder, ResultExtractor, StringOps } -import laika.io.syntax._ -import laika.theme._ +import laika.io.syntax.* +import laika.theme.* import munit.CatsEffectSuite class HeliumTocPageSpec extends CatsEffectSuite with InputBuilder with ResultExtractor diff --git a/io/src/test/scala/laika/io/ParserSetup.scala b/io/src/test/scala/laika/io/ParserSetup.scala index ed2498aae..00ec72514 100644 --- a/io/src/test/scala/laika/io/ParserSetup.scala +++ b/io/src/test/scala/laika/io/ParserSetup.scala @@ -23,7 +23,7 @@ import laika.api.bundle.ExtensionBundle import laika.format.Markdown import laika.io.api.TreeParser import laika.io.helper.TestThemeBuilder -import laika.io.syntax._ +import laika.io.syntax.* import laika.theme.Theme trait ParserSetup { diff --git a/io/src/test/scala/laika/io/TreeParserSpec.scala b/io/src/test/scala/laika/io/TreeParserSpec.scala index 9e41b74a9..3627dacdd 100644 --- a/io/src/test/scala/laika/io/TreeParserSpec.scala +++ b/io/src/test/scala/laika/io/TreeParserSpec.scala @@ -510,7 +510,7 @@ class TreeParserSpec test("template directive") { import laika.api.bundle.TemplateDirectives - import TemplateDirectives.dsl._ + import TemplateDirectives.dsl.* val directive = TemplateDirectives.create("foo") { attribute(0).as[String] map { @@ -620,8 +620,8 @@ class TreeParserSpec object CustomSpanParsers { - import TextParsers._ - import laika.parse.syntax._ + import TextParsers.* + import laika.parse.syntax.* case class DecoratedSpan(deco: Char, text: String) extends Span { val options: Options = Options.empty @@ -663,7 +663,7 @@ class TreeParserSpec } test("use a span parser from a theme") { - import CustomSpanParsers._ + import CustomSpanParsers.* val themeParsers = Seq(spanFor('+')) @@ -679,7 +679,7 @@ class TreeParserSpec } test("let a span parser from an app extension override a span parser from a theme") { - import CustomSpanParsers._ + import CustomSpanParsers.* val themeParsers = Seq(spanFor('+')) val appParsers = Seq(spanFor('+', '!')) @@ -696,7 +696,7 @@ class TreeParserSpec } test("let a span parser from a theme extension override a span parser from a base theme") { - import CustomSpanParsers._ + import CustomSpanParsers.* val themeParsers = Seq(spanFor('+')) val themeExtParsers = Seq(spanFor('+', '!')) diff --git a/io/src/test/scala/laika/io/TreeTransformerSpec.scala b/io/src/test/scala/laika/io/TreeTransformerSpec.scala index e77473711..739efb8d9 100644 --- a/io/src/test/scala/laika/io/TreeTransformerSpec.scala +++ b/io/src/test/scala/laika/io/TreeTransformerSpec.scala @@ -420,7 +420,7 @@ class TreeTransformerSpec extends CatsEffectSuite test("tree with a template directive") { - import TemplateDirectives.dsl._ + import TemplateDirectives.dsl.* val directive = TemplateDirectives.create("foo") { attribute(0).as[String] map { @@ -832,7 +832,7 @@ class TreeTransformerSpec extends CatsEffectSuite } test("read from and write to directories") { - import FileSystemTest._ + import FileSystemTest.* val sourceName = resourcePath("/trees/a/") val expectedFileContents = (1 to 6).map(fileContent).toList val res = for { @@ -844,7 +844,7 @@ class TreeTransformerSpec extends CatsEffectSuite } test("directory with a custom document type matcher") { - import FileSystemTest._ + import FileSystemTest.* val sourceName = resourcePath("/trees/a/") val transformer = transformerWithBundle(BundleProvider.forDocTypeMatcher { case Root / "doc1.md" => Ignored; case Root / "dir1" / _ => Ignored @@ -863,7 +863,7 @@ class TreeTransformerSpec extends CatsEffectSuite } test("allow to specify custom exclude filter") { - import FileSystemTest._ + import FileSystemTest.* val sourceName = resourcePath("/trees/a/") val fileFilter = FileFilter.lift(f => f.name == "doc1.md" || f.name == "dir1") val expectedFileContents = List(2, 5, 6).map(fileContent) @@ -880,7 +880,7 @@ class TreeTransformerSpec extends CatsEffectSuite } test("read from two root directories") { - import FileSystemTest._ + import FileSystemTest.* val source1 = FilePath.parse(resourcePath("/trees/a/")) val source2 = FilePath.parse(resourcePath("/trees/b/")) val expectedFileContents = (1 to 9).map(fileContent).toList diff --git a/io/src/test/scala/laika/io/helper/InputBuilder.scala b/io/src/test/scala/laika/io/helper/InputBuilder.scala index 417349cff..ae5bfeb42 100644 --- a/io/src/test/scala/laika/io/helper/InputBuilder.scala +++ b/io/src/test/scala/laika/io/helper/InputBuilder.scala @@ -19,7 +19,7 @@ package laika.io.helper import cats.effect.IO import laika.ast.{ DocumentType, Path } import laika.config.TargetFormats -import laika.io.model._ +import laika.io.model.* trait InputBuilder { diff --git a/io/src/test/scala/laika/io/helper/TestThemeBuilder.scala b/io/src/test/scala/laika/io/helper/TestThemeBuilder.scala index 60911766d..2f6730686 100644 --- a/io/src/test/scala/laika/io/helper/TestThemeBuilder.scala +++ b/io/src/test/scala/laika/io/helper/TestThemeBuilder.scala @@ -37,7 +37,7 @@ object TestThemeBuilder { } def forBundles(bundles: Seq[ExtensionBundle]): ThemeProvider = new ThemeProvider { - def build[F[_]: Async] = ThemeBuilder("test").addExtensions(bundles: _*).build + def build[F[_]: Async] = ThemeBuilder("test").addExtensions(bundles*).build } def forDocumentMapper(f: Document => Document): ThemeProvider = new ThemeProvider { diff --git a/io/src/test/scala/laika/theme/ThemeBundleSpec.scala b/io/src/test/scala/laika/theme/ThemeBundleSpec.scala index c160e5e51..9ba682b85 100644 --- a/io/src/test/scala/laika/theme/ThemeBundleSpec.scala +++ b/io/src/test/scala/laika/theme/ThemeBundleSpec.scala @@ -46,7 +46,7 @@ class ThemeBundleSpec extends FunSuite { Transformer .from(Markdown) .to(HTML) - .using(appBundles: _*) + .using(appBundles*) .parallel[IO] .withTheme(theme) .build diff --git a/io/src/test/scala/laika/theme/ThemeConfigCodecSpec.scala b/io/src/test/scala/laika/theme/ThemeConfigCodecSpec.scala index 7f5c2f3b5..270d88681 100644 --- a/io/src/test/scala/laika/theme/ThemeConfigCodecSpec.scala +++ b/io/src/test/scala/laika/theme/ThemeConfigCodecSpec.scala @@ -112,7 +112,7 @@ class ThemeConfigCodecSpec extends FunSuite { .withDatePublished(PlatformDateTime.parse("2002-10-10T12:00:00").toOption.get) ) .withNavigationDepth(3) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") assertEquals(decode[BookConfig](input, LaikaKeys.root), Right(expected)) } @@ -143,7 +143,7 @@ class ThemeConfigCodecSpec extends FunSuite { .withIdentifier("XX-33-FF-01") ) .withNavigationDepth(3) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") val encoded = ConfigBuilder.empty.withValue(testKey, input).build assertEquals(decode[BookConfig](encoded), Right(input)) diff --git a/pdf/src/test/scala/laika/render/BookConfigSpec.scala b/pdf/src/test/scala/laika/render/BookConfigSpec.scala index f2d9c3279..3180bf2ce 100644 --- a/pdf/src/test/scala/laika/render/BookConfigSpec.scala +++ b/pdf/src/test/scala/laika/render/BookConfigSpec.scala @@ -84,7 +84,7 @@ class BookConfigSpec extends FunSuite { .withDatePublished(PlatformDateTime.parse("2002-10-10T12:00:00").toOption.get) ) .withNavigationDepth(4) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") assertEquals(actual, Right(expected)) } @@ -93,7 +93,7 @@ class BookConfigSpec extends FunSuite { val input = BookConfig.empty .withMetadata(DocumentMetadata.empty.withIdentifier("XX-33-FF-01")) .withNavigationDepth(3) - .addFonts(TestTheme.fonts *) + .addFonts(TestTheme.fonts*) .withCoverImage(Root / "cover.jpg") val encoded = ConfigBuilder.empty.withValue(testKey, input).build val actual = decode[BookConfig](encoded) diff --git a/preview/src/main/scala/laika/preview/internal/SourceChangeWatcher.scala b/preview/src/main/scala/laika/preview/internal/SourceChangeWatcher.scala index 529fa601c..b308cee51 100644 --- a/preview/src/main/scala/laika/preview/internal/SourceChangeWatcher.scala +++ b/preview/src/main/scala/laika/preview/internal/SourceChangeWatcher.scala @@ -104,8 +104,8 @@ private[preview] class SourceChangeWatcher[F[_]: Async]( @tailrec private def collectEvents( - acc: List[(WatchEvent[_], WatchKey)] - ): List[(WatchEvent[_], WatchKey)] = { + acc: List[(WatchEvent[?], WatchKey)] + ): List[(WatchEvent[?], WatchKey)] = { val key = service.poll() if (key == null) acc else { @@ -118,7 +118,7 @@ private[preview] class SourceChangeWatcher[F[_]: Async]( private case class ProcessedEvent(triggersUpdate: Boolean, newDirectory: Option[FilePath]) private def processEvent( - event: WatchEvent[_], + event: WatchEvent[?], watchKey: WatchKey, targets: Map[WatchKey, ObservedTarget] ): F[ProcessedEvent] = { diff --git a/preview/src/test/scala/laika/preview/PreviewRouteSpec.scala b/preview/src/test/scala/laika/preview/PreviewRouteSpec.scala index 4a99d8ad7..c8c7c2d39 100644 --- a/preview/src/test/scala/laika/preview/PreviewRouteSpec.scala +++ b/preview/src/test/scala/laika/preview/PreviewRouteSpec.scala @@ -21,11 +21,11 @@ import laika.api.MarkupParser import laika.ast.Path.Root import laika.format.Markdown import laika.io.helper.InputBuilder -import laika.io.syntax._ +import laika.io.syntax.* import laika.theme.Theme import munit.CatsEffectSuite import org.http4s.headers.`Content-Type` -import org.http4s.implicits._ +import org.http4s.implicits.* import org.http4s.{ MediaType, Method, Request, Response, Status, Uri } class PreviewRouteSpec extends CatsEffectSuite with InputBuilder { diff --git a/project/ManualSettings.scala b/project/ManualSettings.scala index 560a56b5f..911a2b1f9 100644 --- a/project/ManualSettings.scala +++ b/project/ManualSettings.scala @@ -1,6 +1,6 @@ import laika.ast.LengthUnit.px import laika.ast.Path.Root -import laika.ast._ +import laika.ast.* import laika.helium.Helium import laika.helium.config.{ Favicon, @@ -43,8 +43,8 @@ object ManualSettings { val config = Versions .forCurrentVersion(current) - .withOlderVersions(all.dropWhile(_ != current).drop(1) *) - .withNewerVersions(all.takeWhile(_ != current) *) + .withOlderVersions(all.dropWhile(_ != current).drop(1)*) + .withNewerVersions(all.takeWhile(_ != current)*) } diff --git a/sbt/src/main/scala/laika/sbt/LaikaPlugin.scala b/sbt/src/main/scala/laika/sbt/LaikaPlugin.scala index cf2e2824f..61f17d77a 100644 --- a/sbt/src/main/scala/laika/sbt/LaikaPlugin.scala +++ b/sbt/src/main/scala/laika/sbt/LaikaPlugin.scala @@ -153,9 +153,9 @@ object LaikaPlugin extends AutoPlugin { } - import autoImport._ + import autoImport.* - override def projectSettings: Seq[Setting[_]] = Seq( + override def projectSettings: Seq[Setting[?]] = Seq( Laika / sourceDirectories := Seq(sourceDirectory.value / "docs"), Laika / excludeFilter := HiddenFileFilter, laikaInputs := Settings.defaultInputs.value, diff --git a/sbt/src/main/scala/laika/sbt/Settings.scala b/sbt/src/main/scala/laika/sbt/Settings.scala index e5f5c73bb..4b0af535f 100644 --- a/sbt/src/main/scala/laika/sbt/Settings.scala +++ b/sbt/src/main/scala/laika/sbt/Settings.scala @@ -89,7 +89,7 @@ object Settings { configBuilder = userConfig.configBuilder, compactRendering = parser.config.compactRendering ) - parser.withConfig(mergedConfig).using(laikaExtensions.value *) + parser.withConfig(mergedConfig).using(laikaExtensions.value*) } createParser(Markdown) diff --git a/sbt/src/main/scala/laika/sbt/Tasks.scala b/sbt/src/main/scala/laika/sbt/Tasks.scala index ba63def09..eeafed260 100644 --- a/sbt/src/main/scala/laika/sbt/Tasks.scala +++ b/sbt/src/main/scala/laika/sbt/Tasks.scala @@ -339,14 +339,14 @@ object Tasks { def createParser(format: MarkupFormat): ParserBuilder = { val parser = MarkupParser.of(format) - parser.withConfig(mergedConfig(parser.config)).using(laikaExtensions.value *) + parser.withConfig(mergedConfig(parser.config)).using(laikaExtensions.value*) } val transformer = Transformer .from(Markdown) .to(HTML) .withConfig(mergedConfig(createParser(Markdown).config)) - .using(laikaExtensions.value *) + .using(laikaExtensions.value*) .parallel[IO] .withTheme(laikaTheme.value) .withAlternativeParser(createParser(ReStructuredText))