-
Notifications
You must be signed in to change notification settings - Fork 185
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
scalameta 4.9.x #1927
Merged
Merged
scalameta 4.9.x #1927
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9f01ba5
scalameta 4.9.x
bjaglin 2b0d32d
Origin is now part of the public API
bjaglin 0816e76
force usage of custom scalameta for mdoc
bjaglin e3709f5
compatibility hack until mdoc#842 is released
bjaglin 5f4ef49
preserve no-op behavior when passing trees built with quasiquotes
bjaglin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
scalafix-core/src/main/scala/scala/meta/internal/scalafix/ScalafixScalametaHacks.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,7 @@ | ||
package scala.meta.internal.scalafix | ||
|
||
import scala.meta.Tree | ||
import scala.meta.internal.semanticdb.Scala.Names | ||
import scala.meta.internal.trees.Origin | ||
|
||
object ScalafixScalametaHacks { | ||
def resetOrigin(tree: Tree): Tree = tree.withOrigin(Origin.None) | ||
def encode(name: String): String = Names.encode(name) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ import scala.annotation.tailrec | |
import scala.collection.mutable | ||
|
||
import scala.meta._ | ||
import scala.meta.trees.Origin | ||
|
||
import scalafix.XtensionOptionPatch | ||
import scalafix.XtensionSeqPatch | ||
|
@@ -200,7 +201,11 @@ object ImportPatchOps { | |
allImports.filter(_.importers.forall(isRemovedImporter)) | ||
|
||
def remove(toRemove: Tree): Patch = { | ||
if (toRemove.pos == Position.None) return Patch.empty | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This brings false negatives now that quasiquotes have positions (since scalameta/scalameta#3425). This is effectively a very minor breaking change in the API. |
||
val isSameInput = (toRemove.origin, ctx.tree.origin) match { | ||
case (a: Origin.Parsed, b: Origin.Parsed) => a.input == b.input | ||
case _ => false | ||
} | ||
if (!isSameInput) return Patch.empty | ||
// Imagine "import a.b, c.d, e.f, g.h" where a.b, c.d and g.h are unused. | ||
// All unused imports are responible to delete their leading comma but | ||
// c.d is additionally responsible for deleting its trailling comma. | ||
|
8 changes: 8 additions & 0 deletions
8
scalafix-docs/src/main/scala/scala/meta/internal/prettyprinters/Enquote.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package scala.meta.internal.prettyprinters | ||
|
||
// compatibility hack until https://github.com/scalameta/mdoc/pull/842 is released | ||
object enquote { | ||
def apply(s: String, style: QuoteStyle): String = { | ||
style(s) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unused since 1ab1d7e