Merge pull request #147 from tgodzik/updates2

tgodzik · web-flow · commit 76b247ac9875 · 2023-07-26T16:13:04.000+02:00
Update fork to include newest fixes
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.8"
+version = "3.7.10"
 
 align.preset = more
 maxColumn = 100
diff --git a/frontend/src/main/scala/bloop/logging/BspServerLogger.scala b/frontend/src/main/scala/bloop/logging/BspServerLogger.scala
@@ -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)
diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
 
diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
 
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/custom-test-framework/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/no-test-frameworks/project/project/build.properties b/frontend/src/test/resources/no-test-frameworks/project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/scala-seed-project/project/build.properties b/frontend/src/test/resources/scala-seed-project/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2
diff --git a/frontend/src/test/resources/simple-build/project/build.properties b/frontend/src/test/resources/simple-build/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.2

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.7.8"`
	`1`	`+version = "3.7.10"`
`2`	`2`
`3`	`3`	`align.preset = more`
`4`	`4`	`maxColumn = 100`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=1.9.0`
	`1`	`+sbt.version=1.9.2`
`2`	`2`