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.

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

build(deps): Update scalafmt-core from 3.8.6 to 3.9.0 #7224

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ cb3a4275b4536030d133d19be4fd1d4b1aa9135b

# Scala Steward: Reformat with scalafmt 3.8.5
9105db9a4c85b101a3def29b7e6fc458a5afda71

# Scala Steward: Reformat with scalafmt 3.9.0
7ee123ac8e25d1c9cf07aac590d0c26358f6b35a
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.6"
version = "3.9.0"
runner.dialect = scala213source3
project.git = true
align.preset = none
Expand Down
2 changes: 1 addition & 1 deletion metals-bench/src/main/scala/bench/CompletionBench.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CompletionBench extends PcBenchmark {
"A.scala",
"""|
|object Main{
| def foo = ""
| def foo = ""
| fo
|}
|""".stripMargin,
Expand Down
2 changes: 1 addition & 1 deletion metals-bench/src/main/scala/bench/HoverBench.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class HoverBench extends PcBenchmark {
"""|package a
|
|object Main extends App{
|
|
|}
|""".stripMargin,
"object Main extends Ap@@p",
Expand Down
8 changes: 4 additions & 4 deletions metals-docs/src/main/scala/docs/GenericModifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class GenericModifier extends StringModifier {
|
|The Metals server places logs and other files in the `.metals` directory. The
|Bloop compile server places logs and compilation artifacts in the `.bloop`
|directory. The Bloop plugin that generates Bloop configuration is added in the
|`metals.sbt` file, which is added at `project/metals.sbt` as well as further
|`project` directories depending on how deep `*.sbt` files need to be supported.
|To support each `*.sbt` file Metals needs to create an additional file at
|directory. The Bloop plugin that generates Bloop configuration is added in the
|`metals.sbt` file, which is added at `project/metals.sbt` as well as further
|`project` directories depending on how deep `*.sbt` files need to be supported.
|To support each `*.sbt` file Metals needs to create an additional file at
|`./project/project/metals.sbt` relative to the sbt file.
|Working with Ammonite scripts will place compiled scripts into the `.ammonite` directory.
|It's recommended to exclude these directories and files
Expand Down
4 changes: 2 additions & 2 deletions metals-docs/src/main/scala/docs/NewProjectModifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class NewProjectModifier extends StringModifier {
else ""
s"""|## Create new project from template
|
|It is possible using Metals to easily setup a new project using the exiting [giter8](https://github.com/foundweekends/giter8/wiki/giter8-templates) templates.
|It is possible using Metals to easily setup a new project using the exiting [giter8](https://github.com/foundweekends/giter8/wiki/giter8-templates) templates.
|This is an equivalent to the `sbt new` command, which uses the same mechanism.
|There is a great number of templates already available and it should be easy to find something for yourself.
|To start the setup you can use the $newScalaProject command, which works as following:
Expand All @@ -42,7 +42,7 @@ class NewProjectModifier extends StringModifier {
|$chooseWindow
|$fromButtons
|
|If you feel like a template should be included in the default displayed ones do not hesitate to create a
|If you feel like a template should be included in the default displayed ones do not hesitate to create a
|[PR](https://github.com/scalameta/metals/blob/cda5b8c2029e5f201fb8d0636e0365d796407bd9/metals/src/main/scala/scala/meta/internal/builds/NewProjectProvider.scala#L308)
|or file an issue.
|""".stripMargin
Expand Down
8 changes: 4 additions & 4 deletions metals-docs/src/main/scala/docs/ParentLensesModifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ class ParentLensesModifier extends StringModifier {

s"""|## Go to parent code lenses
|
|Metals has the ability to display code lenses that, when invoked,
|Metals has the ability to display code lenses that, when invoked,
|will go to the parent class that contains the definition of the method or symbol.
|Unfortunately, it might cause some lag in larger code bases,
|Unfortunately, it might cause some lag in larger code bases,
|which is why it is not enabled currently by default.
|
|To enable the feature you need to modify the setting `metals.superMethodLensesEnabled` to `true`.
|
|Even without using the code lenses it's still possible to navigate the method hierarchy
|Even without using the code lenses it's still possible to navigate the method hierarchy
|using two commands:
|
| - `$gotoToSuper` - immediately goes to the parent of the method the cursor is pointing to
|
| - `$superMethodHierarchy` - displays the full method hierachy and enables to move to any parent,
| - `$superMethodHierarchy` - displays the full method hierachy and enables to move to any parent,
|it is best used with the Metals Quick Pick extension.
|$additionalInfo
|""".stripMargin
Expand Down
4 changes: 2 additions & 2 deletions metals-docs/src/main/scala/docs/ScalafixModifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class ScalafixModifier extends StringModifier {
|command `metals.scalafix-run`.${shortcut}
|This should run all the rules defined in your `.scalafix.conf` file. All built-in rules
|and the [community hygiene ones](https://scalacenter.github.io/scalafix/docs/rules/community-rules.html#hygiene-rules) can
|be run without any additional settings. However, for all the other rules users need to
|be run without any additional settings. However, for all the other rules users need to
|add an additional dependency in the `metals.scalafixRulesDependencies` user setting.
|Those rules need to be in form of strings such as `com.github.liancheng::organize-imports:0.6.0`, which
|Those rules need to be in form of strings such as `com.github.liancheng::organize-imports:0.6.0`, which
|follows the same convention as [coursier dependencies](https://get-coursier.io/).
|
|A sample scalafix configuration can be seen below:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TestFrameworksModifier extends StringModifier {
| - Junit
| - MUnit
| - Scalatest
| - Weaver Test
| - Weaver Test
|""".stripMargin

}
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ object ClientCommands {
val StartRunSession = new Command(
"metals-run-session-start",
"Start run session",
s"""|Starts a run session. The address of a new Debug Adapter can be obtained
s"""|Starts a run session. The address of a new Debug Adapter can be obtained
| by using the ${ServerCommands.StartDebugAdapter.id} metals server command
| with the same arguments as provided to this command.
""".stripMargin,
Expand All @@ -208,7 +208,7 @@ object ClientCommands {
val StartDebugSession = new Command(
"metals-debug-session-start",
"Start debug session",
s"""|Starts a debug session. The address of a new Debug Adapter can be obtained
s"""|Starts a debug session. The address of a new Debug Adapter can be obtained
| by using the ${ServerCommands.StartDebugAdapter.id} metals server command
| with the same arguments as provided to this command.
""".stripMargin,
Expand Down Expand Up @@ -308,10 +308,10 @@ object ClientCommands {
"Goto location",
"Move the cursor focus to the provided location",
"""|First required parameter is LSP `Location` object with `uri` and `range` fields.
|Second parameter is optional and has signature `otherWindow: Boolean`.
|Second parameter is optional and has signature `otherWindow: Boolean`.
|It gives a hint to client that if possible it would be good to open location in
|another buffer/window.
|Example:
|Example:
|```json
|[{
| "uri": "file://path/to/Definition.scala",
Expand All @@ -331,7 +331,7 @@ object ClientCommands {
"Open a specified folder either in the same or new window",
"""Open a new window with the specified directory.""".stripMargin,
"""|An object with `uri` and `newWindow` fields.
|Example:
|Example:
|```json
|{
| "uri": "file://path/to/directory",
Expand All @@ -346,7 +346,7 @@ object ClientCommands {
"Copy Worksheet Output",
s"""|Copy the contents of a worksheet to your local buffer.
|
|Note: This command should execute the ${ServerCommands.CopyWorksheetOutput.id}
|Note: This command should execute the ${ServerCommands.CopyWorksheetOutput.id}
| server command to get the output to copy into the buffer.
|
|Server will attempt to create code lens with this command if `copyWorksheetOutputProvider` option is set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ object UserConfiguration {
"false",
"false",
"Should display implicit parameter at usage sites",
"""|When this option is enabled, each method that has implicit arguments has them
|displayed either as additional decorations if they are supported by the editor or
"""|When this option is enabled, each method that has implicit arguments has them
|displayed either as additional decorations if they are supported by the editor or
|shown in the hover.
|""".stripMargin,
),
Expand All @@ -339,8 +339,8 @@ object UserConfiguration {
"false",
"false",
"Should display implicit conversion at usage sites",
"""|When this option is enabled, each place where an implicit method or class is used has it
|displayed either as additional decorations if they are supported by the editor or
"""|When this option is enabled, each place where an implicit method or class is used has it
|displayed either as additional decorations if they are supported by the editor or
|shown in the hover.
|""".stripMargin,
),
Expand Down Expand Up @@ -387,7 +387,7 @@ object UserConfiguration {
BuildInfo.scala3,
BuildInfo.scala3,
"Default fallback Scala version",
"""|The Scala compiler version that is used as the default or fallback in case a file
"""|The Scala compiler version that is used as the default or fallback in case a file
|doesn't belong to any build target or the specified Scala version isn't supported by Metals.
|This applies to standalone Scala files, worksheets, and Ammonite scripts.
""".stripMargin,
Expand Down Expand Up @@ -453,8 +453,8 @@ object UserConfiguration {
"off",
"all",
"Import build when changes detected without prompting",
"""|Automatically import builds rather than prompting the user to choose. "initial" will
|only automatically import a build when a project is first opened, "all" will automate
"""|Automatically import builds rather than prompting the user to choose. "initial" will
|only automatically import a build when a project is first opened, "all" will automate
|build imports after subsequent changes as well.""".stripMargin,
),
UserConfigurationOption(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ abstract class SupportedScalaVersions {
|Scala 3 versions from 3.3.4 are automatically supported by Metals.
|
|Any older Scala versions will no longer get bugfixes, but should still
|work properly with newest Metals.
|work properly with newest Metals.
|""".stripMargin
)
} catch {
Expand Down
4 changes: 2 additions & 2 deletions project/Welcome.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import sbtwelcome._
object Welcome {

val logo =
"""| _ _
| /\/\ ___| |_ __ _| |___
"""| _ _
| /\/\ ___| |_ __ _| |___
| / \ / _ \ __/ _` | / __|
|/ /\/\ \ __/ || (_| | \__ \
|\/ \/\___|\__\__,_|_|___/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
| val x = Foo(
| foo = 123,
| <<ba@@r>> = 456
| )
| )
|
|}""".stripMargin
)
Expand All @@ -74,7 +74,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
| bar = 456
| )
| val y = x.<<foo>>
|
|
|
|}""".stripMargin
)
Expand Down Expand Up @@ -1001,7 +1001,7 @@ class DocumentHighlightSuite extends BaseDocumentHighlightSuite {
"""
|object Main {
| List(1).map {
| someLongName: Int =>
| someLongName: Int =>
| val <<ab@@c>> = 2
| someLongName + <<abc>>
| }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ class Scala3DocumentHighlightSuite extends BaseDocumentHighlightSuite {
|object B {
| extension (x: Int)(using Int)
| def <<foo>>: Int = ???
|
|
| given Int = 42
| val bar = 42.<<fo@@o>>
|}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
"advanced1",
"""
|object Main {
| for {
| abc <- Option(1)
| for {
| abc <- Option(1)
| one = 1
| <<a@@dd>> = one + abc
|} yield {
|} yield {
| <<add>>.toString.toList.map(_.toChar)
| }
|}""".stripMargin
Expand All @@ -22,11 +22,11 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
"advanced2",
"""
|object Main {
| for {
| abc <- Option(1)
| for {
| abc <- Option(1)
| one = 1
| <<add>> = one + abc
|} yield {
|} yield {
| <<ad@@d>>.toString.toList.map(_.toChar)
| }
|}""".stripMargin
Expand All @@ -36,11 +36,11 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
"advanced3",
"""
|object Main {
| for {
| <<a@@bc>> <- Option(1)
| for {
| <<a@@bc>> <- Option(1)
| one = 1
| add = one + <<abc>>
|} yield {
|} yield {
| <<abc>>.toString.toList.map(_.toChar)
| }
|}""".stripMargin
Expand All @@ -50,11 +50,11 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
"advanced4",
"""
|object Main {
| for {
| <<abc>> <- Option(1)
| for {
| <<abc>> <- Option(1)
| one = 1
| add = one + <<a@@bc>>
|} yield {
|} yield {
| <<abc>>.toString.toList.map(_.toChar)
| }
|}""".stripMargin
Expand All @@ -64,11 +64,11 @@ class SyntheticsDocumentHighlightSuite extends BaseDocumentHighlightSuite {
"advanced5",
"""
|object Main {
| for {
| <<abc>> <- Option(1)
| for {
| <<abc>> <- Option(1)
| one = 1
| add = one + <<abc>>
|} yield {
|} yield {
| <<ab@@c>>.toString.toList.map(_.toChar)
| }
|}""".stripMargin
Expand Down
8 changes: 4 additions & 4 deletions tests/cross/src/test/scala/tests/hover/HoverDocSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class HoverDocSuite extends BaseHoverSuite {
check(
"object",
"""|
|/**
|/**
| * Doc about object
| */
|object Alpha {
Expand All @@ -139,7 +139,7 @@ class HoverDocSuite extends BaseHoverSuite {
check(
"object1",
"""|
|/**
|/**
| * Doc about object
| */
|object Alpha {
Expand Down Expand Up @@ -170,7 +170,7 @@ class HoverDocSuite extends BaseHoverSuite {
| */
|case class Alpha(x: Int)
|
|/**
|/**
| * Doc about object
| */
|object Alpha {
Expand Down Expand Up @@ -201,7 +201,7 @@ class HoverDocSuite extends BaseHoverSuite {
| */
|case class Alpha(x: Int)
|
|/**
|/**
| * Doc about object
| */
|object Alpha {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class HoverPlaintextSuite extends BaseHoverSuite {
check(
"basic-plaintext",
"""|
|/**
|/**
| * Some docstring
| */
|case class Alpha(x: Int) {
Expand Down
Loading
Loading