Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 2.7.5 #408

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Update scalafmt-core to 2.7.5 #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b1a8f
Update scalafmt-core to 2.7.5
scala-steward Oct 25, 2020
23c51a6
Reformat with scalafmt 2.7.5
scala-steward Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=2.7.2
version=2.7.5
maxColumn = 100
project.git = true
align.preset = none
Expand Down
3 changes: 1 addition & 2 deletions mdoc-lsp/src/main/scala/mdoc/internal/lsp/LspLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import scribe.Logger
import scribe.format._
import scribe.writer.Writer

/**
* Scribe logging handler that forwards logging messages to the LSP editor client.
/** Scribe logging handler that forwards logging messages to the LSP editor client.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you all have a preference on this? While valid, I know some may prefer using the docstrings.blankFirstLine = "yes" which would preserve the blank line on top. Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both are really fine for me, no particular preference.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, same for me. I'll go ahead and just merge then.

*/
object LspLogger extends Writer {
def update(client: MdocLanguageClient): Unit = {
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/Variable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import mdoc.internal.markdown.Modifier
import mdoc.internal.markdown.ReplVariablePrinter
import scala.meta.inputs.Position

/**
* A captured variable in a code fence.
/** A captured variable in a code fence.
*
* Example, the code fence below has two statements:
*
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/internal/livereload/LiveReload.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package mdoc.internal.livereload

import java.nio.file.Path

/**
* Interface of a LiveReload server http://livereload.com/api/protocol/
/** Interface of a LiveReload server http://livereload.com/api/protocol/
*/
trait LiveReload {

Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/internal/livereload/UndertowLiveReload.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ final case class UndertowLiveReload private (

object UndertowLiveReload {

/**
* Instantiate an undertow file server that speaks the LiveReload protocol.
/** Instantiate an undertow file server that speaks the LiveReload protocol.
*
* See LiveReload protocol for more details: http://livereload.com/api/protocol/
*
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/internal/markdown/Markdown.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ object Markdown {
val RelativePathKey = new DataKey[Option[RelativePath]]("mdocFile", None)
val SiteVariables = new DataKey[Option[Map[String, String]]]("siteVariables", None)

/**
* Defines the default markdown settings.
/** Defines the default markdown settings.
*
* Do not use directly. The default flexmark settings have special keys set
* up by mdoc to keep track of certain document-specific information like path.
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/internal/markdown/MdocExtensions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import mdoc.internal.cli.Context

object MdocExtensions {

/**
* Defines mdoc's markdown extensions.
/** Defines mdoc's markdown extensions.
*
* Inspired by CommonMark formatter options so that pandoc understands it.
* https://github.com/vsch/flexmark-java/blob/master/flexmark-java-samples/src/com/vladsch/flexmark/samples/FormatConverterCommonMark.java#L27-L37
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala-2/mdoc/internal/markdown/Modifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package mdoc.internal.markdown
import mdoc.StringModifier
import mdoc.internal.markdown.Mod._

/**
* A mdoc code fence modifier.
/** A mdoc code fence modifier.
*
* Modifiers are parsed from code blocks like here
*
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala/mdoc/internal/CompatClassloader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import scala.collection.JavaConverters._

object CompatClassloader {

/**
* Utility to get SystemClassLoader/ClassLoader urls in java8 and java9+
/** Utility to get SystemClassLoader/ClassLoader urls in java8 and java9+
* Based upon: https://gist.github.com/hengyunabc/644f8e84908b7b405c532a51d8e34ba9
*/
def getURLs(classLoader: ClassLoader): Seq[URL] = {
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala/mdoc/internal/cli/InputFile.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import metaconfig.Input
import java.nio.file.Files
import mdoc.internal.pos.PositionSyntax._

/**
* @param relpath the input filename relativized by its input directory.
/** @param relpath the input filename relativized by its input directory.
* @param inputFile the input file to read from.
* @param outputFile the output file to write to.
* @param inputDirectory directory enclosing the input file.
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala/mdoc/internal/markdown/SharedRepositoryParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/**
* This file is derived from the following Coursier sources, see NOTICE for license details.
/** This file is derived from the following Coursier sources, see NOTICE for license details.
* https://github.com/coursier/coursier/blob/dfb04cab48a4beefa2be59fc71e3eff0493a5886/modules/coursier/shared/src/main/scala/coursier/Repositories.scala
* https://github.com/coursier/coursier/blob/dfb04cab48a4beefa2be59fc71e3eff0493a5886/modules/coursier/shared/src/main/scala/coursier/internal/SharedRepositoryParser.scala
*/
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala/mdoc/internal/pos/BinarySearch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ object BinarySearch {
case object Equal extends ComparisonResult
case object Smaller extends ComparisonResult

/**
* Binary search using a custom compare function.
/** Binary search using a custom compare function.
*
* scala.util.Searching does not support the ability to search an IndexedSeq
* by a custom mapping function, you must search by an element of the same
Expand Down
3 changes: 1 addition & 2 deletions mdoc/src/main/scala/mdoc/internal/pos/TokenEditDistance.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ object TokenEditDistance {

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

/**
* Build utility to map offsets between two slightly different strings.
/** Build utility to map offsets between two slightly different strings.
*
* @param original The original snapshot of a string, for example the latest
* semanticdb snapshot.
Expand Down
6 changes: 2 additions & 4 deletions runtime/src/main/scala/mdoc/document/CompileResult.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ object CompileResult {

sealed trait CompileError extends CompileResult

/**
* Compiler reported an error message during typechecking.
/** Compiler reported an error message during typechecking.
* @param message the typechecking error message (without position formatting)
* @param pos the range position inside the code fence
*/
final case class TypeError(message: String, pos: RangePosition) extends CompileError

/**
* Compiler reported an error message during parsing.
/** Compiler reported an error message during parsing.
* @param message the syntax error message (without position formatting)
* @param pos the range position inside the code fence
*/
Expand Down