Commit Graph

11524 Commits

Author SHA1 Message Date
eugene yokota 359dbed6a8
Merge pull request #6902 from unkarjedy/oldshell-fix-1.7.x
"oldshell" command should use `OldShell` on failure instead of `Shell`
2022-05-25 12:18:33 -04:00
dmitrii.naumenko 9565e33ea8 "oldshell" command should use `OldShell` on failure instead of `Shell`
following up https://github.com/sbt/sbt/pull/3098
2022-05-23 19:58:41 +03:00
Eugene Yokota 053834aea0 Zinc 1.7.0-M2 2022-04-17 23:26:40 -04:00
eugene yokota 1ec23fa616
Merge pull request #6883 from eed3si9n/bport/6870
[1.7.x] Backport 6870, 6880, and 6882
2022-04-17 19:35:54 -04:00
Philippus 11275f604c Fix typos 2022-04-17 18:32:38 -04:00
Philippus 20a9269e79 Add SBTN_AUTO_COMPLETE environment variable 2022-04-17 18:32:30 -04:00
xuwei-k 45518c7f24 Update semanticdbVersion 2022-04-17 18:32:14 -04:00
Ethan Atkins ca7c872e27 Restore watchOnTermination
At some point the watchOnTermination callback stopped working. I'm not
exactly sure how or why that happened but it is fairly straightforward
to restore. The one tricky thing was that the callback has the signature
(Watch.Action, _, _, _) => State, which requires propagating the action
to the failWatch command. The easiest way to do this was to add a
mutable field to the ContinuousState. This is rather ugly and reflects
some poor design choices but a more comprehensive refactor is out of
the scope of this fix.

This commit adds a scripted test that ensures that the callback is
invoked both in the successful and unsuccessful watch cases. In each
case the callback deletes a file and we ensure that the file is indeed
absent after the watch exits.
2022-04-17 18:31:54 -04:00
Ethan Atkins 64c7071ff2 Move on-termination test 2022-04-17 18:31:45 -04:00
eugene yokota 43048e44f6
Merge pull request #6879 from kpodsiad/bsp/server-capabilities
bsp: add JVM test/run env capabilities to BSP
2022-04-17 18:27:29 -04:00
eugene yokota 543e8318b0
Merge pull request #6874 from ckipp01/problem
feat: update Problem to account for related information and code
2022-04-17 14:22:25 -04:00
Kamil Podsiadlo faf8dfde72 bsp: add JVM test/run env capabilities to BSP 2022-04-16 13:46:12 +02:00
Adrien Piquerez e37b0f44a1
Merge pull request #6875 from kpodsiad/backport/6858
[1.7.x] feat: implement BSP's environment requests
2022-04-12 21:03:06 +02:00
Kamil Podsiadlo f16412c3dd tests: run&test environment requests 2022-04-12 20:09:39 +02:00
Kamil Podsiadlo 6eb911ad15 refactor: simplify JVm environment requests
refactor: extract common logic to the `bspInputTask`
2022-04-12 20:09:35 +02:00
Kamil Podsiadlo ad4113caeb feat: implement BSP's JVM environment requests 2022-04-12 20:09:31 +02:00
Kamil Podsiadlo 85efc87879 feat: generate JVM environment requests 2022-04-12 20:09:26 +02:00
Chris Kipp f90b09f1ee feat: update Problem to account for related information and code
This PR makes changes to the existing `xsbti.Problem` to account for an
optional diagnostic code that the compiler can return for a given
diagnostic and also related information.

Given a piece of code like:

```scala
try {}
```

You'll receive the following:

```
-- [E002] Syntax Warning: /Users/ckipp/Documents/scala-workspace/dotty-error-index/examples/002_EmptyCatchAndFinallyBlockID.scala:3:2
3 |  try {}
  |  ^^^^^^
  |  A try without catch or finally is equivalent to putting
  |  its body in a block; no exceptions are handled.
```

The `E002` here is the actual code. Right now there would be no
description.

Some diagnostics have multiple positions that they need to represent.
You can see an example of this
[here](lampepfl/dotty#14002) in Dotty with the
use of inlining. Instead of needing to rely on including all of that
information in the diagnostic message it can now be extracted out into
a `DiagnosticRelatedInformation`.

These changes reference the conversation in #6868
2022-04-12 11:13:19 +02:00
eugene yokota d065f38576
Merge pull request #6854 from eed3si9n/bport/6847
[1.7.x] Do not fire `build/publishDiagnostics` if there are (and were) no problems
2022-03-27 00:55:00 -04:00
eugene yokota 71f45ba404
Merge pull request #6853 from eed3si9n/bport/6849
[1.7.x] includePluginResolvers should work for coursier resolutions
2022-03-27 00:54:48 -04:00
Rikito Taniguchi f5e9ab8424 Add test to verify server doesn't send notifications 2022-03-27 00:12:30 -04:00
Rikito Taniguchi 620c55d6ac Re-publish warnings on BSP server startup
Imitate 8aaf828b03
2022-03-27 00:12:23 -04:00
Rikito Taniguchi 862d373f02 Don't fire publishDiagnostic if there's no problems both in current and previous compilation 2022-03-27 00:12:14 -04:00
Brice Jaglin 491f70cd30 includePluginResolvers should work for coursier resolutions 2022-03-27 00:06:55 -04:00
eugene yokota 2962b088a0
Merge pull request #6814 from prolativ/scala-release-flag
Add support for Scala 3 -scala-output-version flag
2022-03-26 23:36:16 -04:00
Michał Pałka 1e89d71311 Add support for scala-output-version flag in Scala 3 2022-03-24 15:35:57 +01:00
Adrien Piquerez f0552e4bc3
Merge pull request #6830 from kpodsiad/feat/scala-test-classes-framework
feat: add optional framework field to the bsp
2022-03-16 08:56:10 +01:00
Kamil Podsiadlo ce978a19ed tests: add test case for framework field in scala test classes request 2022-03-10 19:56:49 +01:00
Adrien Piquerez 1396e1605d Try fix CI: Build and test (6) 2022-03-08 18:19:20 +01:00
Kamil Podsiadlo 23b50688ba feat: add optional framework field to the bsp 2022-03-04 10:53:25 +01:00
eugene yokota c7f2c046b6
Merge pull request #6816 from Nirvikalpa108/fix-6802
Fixes parsing command args that include quotes but don't start with them
2022-02-04 14:42:22 -05:00
Amina Adewusi ca8fd354bd Fixes parsing command args quote problem
Fixes #6802.
2022-02-04 17:52:39 +00:00
Eugene Yokota ed022a70ac sbt 1.6.2 2022-01-31 23:25:20 -05:00
eugene yokota 567fd8b60b
Merge pull request #6808 from eed3si9n/wip/lm
[1.6.x] Make License object available
2022-01-31 22:47:04 -05:00
eugene yokota 611b8cf01b
Merge pull request #6807 from eed3si9n/bport/6803
[1.6.x] fix: propagate `InterruptedException` from JLine.readLine
2022-01-31 22:11:10 -05:00
Eugene Yokota 761ad14267 Make License object available
Fixes #1937
Ref https://github.com/sbt/librarymanagement/pull/395
2022-01-31 22:00:54 -05:00
tpetillot 4f9fe2af64 fix: propagate `InterruptedException` from JLine.readLine
Motivation:
Cannot exit from InteractionService.readLine

Modification:
Remove try/catch of InterruptedException mapped to None in JLine.readLine
2022-01-31 21:40:32 -05:00
eugene yokota ca0fd3db8c
Merge pull request #6806 from eed3si9n/wip/test_framework
[1.6.x] Throw when test framework cannot be loaded due to MatchError or NoClassDefFoundError
2022-01-31 17:13:51 -05:00
Eugene Yokota a549e79c1d Throw when test framework cannot be loaded due to MatchError or NoClassDefFoundError
Problem
-------
In some situations like Dotty Community Build, sbt version is
mechanically upgraded on an old commit without humans checking the log.
For reasons we're not completely sure (likely change in ClassLoader
structure) sbt 1.6.x started to fail to load test frameworks during
tests, but since the failure of the test framework loading doesn't fail
the task, this silently succeeded the builds.

Solution
--------
On MatchError and NoClassDefFound Error, rethrow the exception.
Note that ClassNotFoundException is considered ok since we have
predefined test frameworks listed in sbt, which often are not included
in the users' classpath.
2022-01-31 16:37:38 -05:00
Eugene Yokota f5fb537c6d sbt 1.6.1 2022-01-31 16:23:00 -05:00
eugene yokota 0518ede298
Merge pull request #6799 from Nirvikalpa108/remove-unimplemented-scalacoption
Remove scalacoption -S-X
2022-01-21 10:28:23 -05:00
Amina Adewusi a3610377d4 Remove scalacoption -S-X
Fixes https://github.com/sbt/sbt/issues/6785.
2022-01-21 14:51:11 +00:00
eugene yokota a523fa8662
Merge pull request #6766 from eed3si9n/wip/lazyval
Use lazy val
2021-12-28 23:46:25 -05:00
Eugene Yokota 515993498d Use lazy val 2021-12-28 23:45:04 -05:00
eugene yokota 06a09b03dd
Merge pull request #6765 from eed3si9n/wip/log4j
[1.6.x] log4j 2.17.1
2021-12-28 23:40:39 -05:00
Eugene Yokota d71a1fbdac log4j 2.17.1
Fixes CVE-2021-44832
https://logging.apache.org/log4j/2.x/security.html
2021-12-28 23:07:39 -05:00
Eugene Yokota 43088834d2 sbt 1.6.0 2021-12-26 13:44:22 -05:00
eugene yokota d4e8d0e4de
Merge pull request #6762 from eed3si9n/wip/bump
[1.6.0] Zinc 1.6.0
2021-12-26 02:17:39 -05:00
Eugene Yokota 544a935534 Update banner 2021-12-26 01:48:14 -05:00
gontard 990fa9530f Ensure sbtConfig argv does not need sbt in PATH
Before, the BSP config .bsp/sbt.json generated by `sbt bspConfig`
contained a command line which required the sbt binary in the PATH.
This fix changes the nature of the -Dsbt.script option. It was
an argument of the main class xsbt.boot.Boot, it's now a system
property and thus it's used to launch the sbt server.

Fixes https://github.com/sbt/sbt/issues/6760
2021-12-26 01:47:21 -05:00