Commit Graph

11609 Commits

Author SHA1 Message Date
frosforever 1b21ecb1ce Protect against missing edges in graph by using map get vs apply 2022-07-19 09:55:45 -04:00
Adrien Piquerez a2060c9ba0
Merge pull request #6929 from kpodsiad/bsp-diagnostics-fix
fix: publish BSP diagnostics when it's necessary
2022-06-25 11:10:57 +02:00
Adrien Piquerez d0b8982bf4
Merge branch 'develop' into bsp-diagnostics-fix 2022-06-24 14:08:56 +02:00
eugene yokota a12ef40485
Merge pull request #6894 from raboof/fuzzy-switch
Add support for wildcards in Scala version switch
2022-06-23 12:18:25 -04:00
Kamil Podsiadlo e8d60efbb4 fix: publishing bsp diagnostics
* do not publish bsp diagnostics if there were and there are no problems
* publish diagnostics if problems needs to be updated
2022-06-23 08:25:36 +02:00
Arnout Engelen 0d0a654c6f
Add support for wildcards in Scala version switch
Picking from the `crossScalaVersions`

As discussed in https://github.com/sbt/sbt/discussions/6893
2022-06-21 17:01:04 +02:00
eugene yokota 5e3f547710
Merge pull request #6856 from opencastsoftware/remove-for-set-and-map
Add Remove instances for Set and Map
2022-06-16 18:24:28 -04:00
David Gregory 833483960f
Merge branch 'develop' into remove-for-set-and-map 2022-06-16 13:53:36 +01:00
eugene yokota ddbb367573
Merge pull request #6920 from eed3si9n/wip/merge-1.7.x
Merge 1.7.x
2022-06-13 03:04:14 -04:00
Eugene Yokota 060a85f0d5 Merge branch '1.7.x' into wip/merge-1.7.x 2022-06-13 02:27:30 -04:00
eugene yokota 290925fd99
Merge pull request #6916 from eed3si9n/wip/revert-6814
[1.7.x] Revert "Add support for scala-output-version flag in Scala 3"
2022-06-13 01:57:48 -04:00
eugene yokota a4b05466c4
Merge pull request #6917 from eed3si9n/wip/bump-scala
[1.7.x] Bump to Scala 2.12.16
2022-06-13 01:49:22 -04:00
Eugene Yokota d9e43ecfdf Revert "Add support for scala-output-version flag in Scala 3"
This reverts commit 1e89d71311.
2022-06-13 01:28:37 -04:00
Eugene Yokota d5889d3ce3 Bump to Scala 2.12.16 2022-06-13 01:27:24 -04:00
eugene yokota 6afc6b53be
Merge pull request #6919 from eed3si9n/wip/lm
[1.7.x] lm 1.7.0-M1
2022-06-13 01:25:32 -04:00
eugene yokota 747e336e51
Merge pull request #6918 from sbt/dependabot/github_actions/actions/setup-python-4
Bump actions/setup-python from 3 to 4
2022-06-13 01:02:42 -04:00
Eugene Yokota c04b2a4f73 lm 1.7.0-M1
This removes OkHttp dependency.
This also removes an experimental feature to customize HTTP for Ivy called
CustomHttp we added in sbt 1.3.0.
Since LM got switched to Coursier in 1.3.0, I don't think we advertized
CustomHttp.
2022-06-13 00:52:32 -04:00
dependabot[bot] 4bc880bfae
Bump actions/setup-python from 3 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 04:02:43 +00:00
eugene yokota 1b4b9f3618
Merge pull request #6907 from eed3si9n/bport/6887
[1.7.x] Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets
2022-05-29 01:51:37 -04:00
Alonso Montero 120014bd65 Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets (#6887)
The `XDG_RUNTIME_DIR` environment variable will be used to choose the base directory in which the sockets will be created by **sbt**. This can help when issues such as #6777 appear. There are other related issues, such as #6101, [Metals issue #2235](https://github.com/scalameta/metals/issues/2235), [Che issue #18394](https://github.com/eclipse/che/issues/18394). Those are closed issues, but there are some cases in which the solution does not work (such as the case in #6777). Furthermore, the solution given seems more like a workaround than an actual fix.

**What causes this issue?**
At least in my case, the **ServerAlreadyBootingException** is thrown after **sbt** tries to create a Unix domain socket and fails. In my specific environment, I was not able to create the sockets in some directories because they were mounted on an NFS. This prevented me from using any automated sbt command on any of those directories (Metals uses sbt under the hood, and it was not able to start because of the ServerAlreadyBootingException), which in turn resulted in me not being able to use Metals on a project that was created on any of those directories. 

**How is the issue solved in this PR?**
If the `XDG_RUNTIME_DIR` environment variable is set, then sockets will be created in a folder with a hashed name, inside the directory `XDG_RUNTIME_DIR/.sbt/`. If this variable is not set, everything works exactly the same as always.

Let's see an example:

1. My environment variable `XDG_RUNTIME_DIR` is set to /home/alonso/.runtime-dir`
2. I create my project in `/home/alonso/workspace/hello-world`
3. I run `sbt compile`
4. The socket is created in `/home/alonso/.runtime-dir/.sbt/sbt-socket102030405060/sbt-load.sock`. The number **102030405060** is a hash that is computed from the base directory of the project (it is actually the same hash that is produced in order to create sockets in Windows) and it will be different depending on the location of the project
5. The sbt command executed correctly, which would not have happened if the socket had been created in the `home/alonso/workspace` directory or any of its subdirectories (in this example, `/home/BlackDiamond/workspace` corresponds to a network file share)

Co-authored-by: Alonso Montero <lumontero@mobilize.net>
2022-05-28 23:38:56 -04:00
eugene yokota e0f67601ca
Merge pull request #6903 from gontard/testQuickFix5504
Fix testQuick on changed function in object
2022-05-28 18:54:18 -04:00
Alonso Montero 86fd6dc058
Use XDG_RUNTIME_DIR environment variable to choose the path used for the creation of sockets (#6887)
The `XDG_RUNTIME_DIR` environment variable will be used to choose the base directory in which the sockets will be created by **sbt**. This can help when issues such as #6777 appear. There are other related issues, such as #6101, [Metals issue #2235](https://github.com/scalameta/metals/issues/2235), [Che issue #18394](https://github.com/eclipse/che/issues/18394). Those are closed issues, but there are some cases in which the solution does not work (such as the case in #6777). Furthermore, the solution given seems more like a workaround than an actual fix.

**What causes this issue?**
At least in my case, the **ServerAlreadyBootingException** is thrown after **sbt** tries to create a Unix domain socket and fails. In my specific environment, I was not able to create the sockets in some directories because they were mounted on an NFS. This prevented me from using any automated sbt command on any of those directories (Metals uses sbt under the hood, and it was not able to start because of the ServerAlreadyBootingException), which in turn resulted in me not being able to use Metals on a project that was created on any of those directories. 

**How is the issue solved in this PR?**
If the `XDG_RUNTIME_DIR` environment variable is set, then sockets will be created in a folder with a hashed name, inside the directory `XDG_RUNTIME_DIR/.sbt/`. If this variable is not set, everything works exactly the same as always.

Let's see an example:

1. My environment variable `XDG_RUNTIME_DIR` is set to /home/alonso/.runtime-dir`
2. I create my project in `/home/alonso/workspace/hello-world`
3. I run `sbt compile`
4. The socket is created in `/home/alonso/.runtime-dir/.sbt/sbt-socket102030405060/sbt-load.sock`. The number **102030405060** is a hash that is computed from the base directory of the project (it is actually the same hash that is produced in order to create sockets in Windows) and it will be different depending on the location of the project
5. The sbt command executed correctly, which would not have happened if the socket had been created in the `home/alonso/workspace` directory or any of its subdirectories (in this example, `/home/BlackDiamond/workspace` corresponds to a network file share)

Co-authored-by: Alonso Montero <lumontero@mobilize.net>
2022-05-26 23:10:41 -04:00
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
gontard 3c497addd1 Fix testQuick on changed function in object
Fix https://github.com/sbt/sbt/issues/5504
2022-05-24 10:56:25 +02:00
gontard 903fd6ae7a Reproduce issue #5504 in scripted test 2022-05-24 10:55:42 +02:00
gontard 65cdcf434d Activate test-quick scripted test 2022-05-23 21:31:26 +02:00
gontard e42c6ccaed Fix scripted tests doc 2022-05-23 20:54:11 +02: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
xuwei-k f6ff6996a5 fix typo 2022-05-23 07:37:34 +09:00
eugene yokota 3a9a384035
Merge pull request #6889 from eed3si9n/wip/oldLastGrep
Fix Main.scala referencing oldLastGrep
2022-05-01 14:29:04 -04:00
Eugene Yokota c4840ec473 Fix Main.scala referencing oldLastGrep 2022-05-01 03:07:17 -04: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 f12a199a1a
Merge pull request #6769 from naferx/remove-old-lastgrep
Remove deprecated command last-grep
2022-04-17 14:24:26 -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
eugene yokota a32c7b098b
Merge pull request #6882 from Philippus/add-sbtn-auto-complete-env-variable
Add SBTN_AUTO_COMPLETE environment variable
2022-04-17 14:18:14 -04:00
Philippus 1d3b9143a4
Fix typos 2022-04-17 12:59:28 +02:00
Philippus cf976885f7
Add SBTN_AUTO_COMPLETE environment variable 2022-04-17 12:59:28 +02:00
eugene yokota 80cfe50e8d
Merge pull request #6880 from xuwei-k/update-semanticdbVersion
Update `semanticdbVersion`
2022-04-16 12:50:32 -04:00
xuwei-k ec9c3f26c6 Update semanticdbVersion 2022-04-16 21:53:32 +09: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
Adrien Piquerez dbdd6c2609
Merge pull request #6858 from kpodsiad/feat/bsp-env-request
feat: implement BSP's environment requests
2022-04-12 21:02:52 +02:00
Kamil Podsiadlo f16412c3dd tests: run&test environment requests 2022-04-12 20:09:39 +02:00