Skip to content

Update fork to include newest fixes #147

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

Merged
tgodzik merged 4 commits into from
Jul 26, 2023
Merged

Update fork to include newest fixes #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d556682
chore: Update scalafmt to 3.7.9
tgodzik Jul 26, 2023
ba87dff
chore: Update sbt everywhere to 1.9.2
tgodzik Jul 26, 2023
7d85e8d
chore: Update scalafmt to 3.7.10
tgodzik Jul 26, 2023
755a591
bugfix: Handle compiler position that is not a range
tgodzik Jul 21, 2023
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 = "3.7.8"
version = "3.7.10"

align.preset = more
maxColumn = 100
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/main/scala/bloop/logging/BspServerLogger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ final class BspServerLogger private (
private def toExistingBspPosition(pos: xsbti.Position): Option[bsp.Range] = {
def asIntPos(opt: Optional[Integer]) = InterfaceUtil.toOption(opt).map(_.toInt)
for {
startLine <- asIntPos(pos.startLine())
startColumn <- asIntPos(pos.startColumn())
endLine <- asIntPos(pos.endLine())
endColumn <- asIntPos(pos.endColumn())
startLine <- asIntPos(pos.startLine()).orElse(asIntPos(pos.line()))
startColumn <- asIntPos(pos.startColumn()).orElse(asIntPos(pos.pointer()))
endLine = asIntPos(pos.endLine()).getOrElse(startLine)
endColumn = asIntPos(pos.endColumn()).getOrElse(startColumn)
} yield bsp.Range(
bsp.Position(startLine - 1, startColumn),
bsp.Position(endLine - 1, endColumn)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.9.0
sbt.version=1.9.2

2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.9.0
sbt.version=1.9.2

2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/custom-test-framework/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/no-test-frameworks/project/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/scala-seed-project/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2
2 changes: 1 addition & 1 deletion frontend/src/test/resources/simple-build/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.0
sbt.version=1.9.2