Skip to content

Commit 2d61305

Browse files
authored
Merge pull request #408 from scala-steward/update/scalafmt-core-2.7.5
2 parents 536b29d + 23c51a6 commit 2d61305

File tree

14 files changed

+15
-29
lines changed

14 files changed

+15
-29
lines changed

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.7.2
1+
version=2.7.5
22
maxColumn = 100
33
project.git = true
44
align.preset = none

mdoc-lsp/src/main/scala/mdoc/internal/lsp/LspLogger.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import scribe.Logger
88
import scribe.format._
99
import scribe.writer.Writer
1010

11-
/**
12-
* Scribe logging handler that forwards logging messages to the LSP editor client.
11+
/** Scribe logging handler that forwards logging messages to the LSP editor client.
1312
*/
1413
object LspLogger extends Writer {
1514
def update(client: MdocLanguageClient): Unit = {

mdoc/src/main/scala-2/mdoc/Variable.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import mdoc.internal.markdown.Modifier
44
import mdoc.internal.markdown.ReplVariablePrinter
55
import scala.meta.inputs.Position
66

7-
/**
8-
* A captured variable in a code fence.
7+
/** A captured variable in a code fence.
98
*
109
* Example, the code fence below has two statements:
1110
*

mdoc/src/main/scala-2/mdoc/internal/livereload/LiveReload.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package mdoc.internal.livereload
22

33
import java.nio.file.Path
44

5-
/**
6-
* Interface of a LiveReload server http://livereload.com/api/protocol/
5+
/** Interface of a LiveReload server http://livereload.com/api/protocol/
76
*/
87
trait LiveReload {
98

mdoc/src/main/scala-2/mdoc/internal/livereload/UndertowLiveReload.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ final case class UndertowLiveReload private (
5454

5555
object UndertowLiveReload {
5656

57-
/**
58-
* Instantiate an undertow file server that speaks the LiveReload protocol.
57+
/** Instantiate an undertow file server that speaks the LiveReload protocol.
5958
*
6059
* See LiveReload protocol for more details: http://livereload.com/api/protocol/
6160
*

mdoc/src/main/scala-2/mdoc/internal/markdown/Markdown.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ object Markdown {
3131
val RelativePathKey = new DataKey[Option[RelativePath]]("mdocFile", None)
3232
val SiteVariables = new DataKey[Option[Map[String, String]]]("siteVariables", None)
3333

34-
/**
35-
* Defines the default markdown settings.
34+
/** Defines the default markdown settings.
3635
*
3736
* Do not use directly. The default flexmark settings have special keys set
3837
* up by mdoc to keep track of certain document-specific information like path.

mdoc/src/main/scala-2/mdoc/internal/markdown/MdocExtensions.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ import mdoc.internal.cli.Context
1515

1616
object MdocExtensions {
1717

18-
/**
19-
* Defines mdoc's markdown extensions.
18+
/** Defines mdoc's markdown extensions.
2019
*
2120
* Inspired by CommonMark formatter options so that pandoc understands it.
2221
* https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/FormatConverterCommonMark.java#L27-L37

mdoc/src/main/scala-2/mdoc/internal/markdown/Modifier.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ package mdoc.internal.markdown
33
import mdoc.StringModifier
44
import mdoc.internal.markdown.Mod._
55

6-
/**
7-
* A mdoc code fence modifier.
6+
/** A mdoc code fence modifier.
87
*
98
* Modifiers are parsed from code blocks like here
109
*

mdoc/src/main/scala/mdoc/internal/CompatClassloader.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import scala.collection.JavaConverters._
77

88
object CompatClassloader {
99

10-
/**
11-
* Utility to get SystemClassLoader/ClassLoader urls in java8 and java9+
10+
/** Utility to get SystemClassLoader/ClassLoader urls in java8 and java9+
1211
* Based upon: https://gist.github.com/hengyunabc/644f8e84908b7b405c532a51d8e34ba9
1312
*/
1413
def getURLs(classLoader: ClassLoader): Seq[URL] = {

mdoc/src/main/scala/mdoc/internal/cli/InputFile.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import metaconfig.Input
77
import java.nio.file.Files
88
import mdoc.internal.pos.PositionSyntax._
99

10-
/**
11-
* @param relpath the input filename relativized by its input directory.
10+
/** @param relpath the input filename relativized by its input directory.
1211
* @param inputFile the input file to read from.
1312
* @param outputFile the output file to write to.
1413
* @param inputDirectory directory enclosing the input file.

mdoc/src/main/scala/mdoc/internal/markdown/SharedRepositoryParser.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/**
2-
* This file is derived from the following Coursier sources, see NOTICE for license details.
1+
/** This file is derived from the following Coursier sources, see NOTICE for license details.
32
* https://github.com/coursier/coursier/blob/dfb04cab48a4beefa2be59fc71e3eff0493a5886/modules/coursier/shared/src/main/scala/coursier/Repositories.scala
43
* https://github.com/coursier/coursier/blob/dfb04cab48a4beefa2be59fc71e3eff0493a5886/modules/coursier/shared/src/main/scala/coursier/internal/SharedRepositoryParser.scala
54
*/

mdoc/src/main/scala/mdoc/internal/pos/BinarySearch.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ object BinarySearch {
88
case object Equal extends ComparisonResult
99
case object Smaller extends ComparisonResult
1010

11-
/**
12-
* Binary search using a custom compare function.
11+
/** Binary search using a custom compare function.
1312
*
1413
* scala.util.Searching does not support the ability to search an IndexedSeq
1514
* by a custom mapping function, you must search by an element of the same

mdoc/src/main/scala/mdoc/internal/pos/TokenEditDistance.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ object TokenEditDistance {
7979

8080
lazy val empty: TokenEditDistance = new TokenEditDistance(Array.empty)
8181

82-
/**
83-
* Build utility to map offsets between two slightly different strings.
82+
/** Build utility to map offsets between two slightly different strings.
8483
*
8584
* @param original The original snapshot of a string, for example the latest
8685
* semanticdb snapshot.

runtime/src/main/scala/mdoc/document/CompileResult.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ object CompileResult {
88

99
sealed trait CompileError extends CompileResult
1010

11-
/**
12-
* Compiler reported an error message during typechecking.
11+
/** Compiler reported an error message during typechecking.
1312
* @param message the typechecking error message (without position formatting)
1413
* @param pos the range position inside the code fence
1514
*/
1615
final case class TypeError(message: String, pos: RangePosition) extends CompileError
1716

18-
/**
19-
* Compiler reported an error message during parsing.
17+
/** Compiler reported an error message during parsing.
2018
* @param message the syntax error message (without position formatting)
2119
* @param pos the range position inside the code fence
2220
*/

0 commit comments

Comments
 (0)