дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-20 16:39:31 +02:00
Порівняти коміти
35
Коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
c67771aabb | ||
|
|
7e2e2e6cc9 | ||
|
|
de73495ab0 | ||
|
|
6c848b9a43 | ||
|
|
4812adba97 | ||
|
|
af938d0726 | ||
|
|
8562fadde2 | ||
|
|
a50813eb56 | ||
|
|
282f1fd482 | ||
|
|
2129efd196 | ||
|
|
a4de18796b | ||
|
|
cbf09b8962 | ||
|
|
f9077a1f93 | ||
|
|
68d2370c8f | ||
|
|
d735a7b7ce | ||
|
|
4ac0cbd908 | ||
|
|
142552741a | ||
|
|
685b458ad0 | ||
|
|
846794450a | ||
|
|
5e78713188 | ||
|
|
33c802c048 | ||
|
|
1e75b7717b | ||
|
|
28a464d3b7 | ||
|
|
0b9048ce02 | ||
|
|
4567540b95 | ||
|
|
3a0288111d | ||
|
|
a83fc0f3d1 | ||
|
|
1a12c88f0c | ||
|
|
6400206a94 | ||
|
|
49d8e1bc71 | ||
|
|
8a56c204f4 | ||
|
|
5bf4d4bb15 | ||
|
|
84dcd99f7b | ||
|
|
ea8351d9f6 | ||
|
|
aab6d9ffdc |
No files matched your search
Створено
+106
-106
@@ -1203,27 +1203,27 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-assembler-x64"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "249a61efca6a54425e027f5704a6f68a0232b4df527e05a3ef947d89dbdcb078"
|
||||
checksum = "aecefa88696b62f833cc0c997d19c93246b0268e2aaf23e0e8692e527f6de088"
|
||||
dependencies = [
|
||||
"cranelift-assembler-x64-meta",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-assembler-x64-meta"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d5336a46e05db2d515440b1ce8a9363e7bc04b608c0f66cc98dddc5492a66fbf"
|
||||
checksum = "1391a2546f5edf06a0ff5e9430d73c2713fd536aefec53200dc21846d1467f53"
|
||||
dependencies = [
|
||||
"cranelift-srcgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-bforest"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01b3675b13214270fddbd257d5fbf4109be8b02d92fc636fe96e2829514a7235"
|
||||
checksum = "9528915fbc2c950702329e08c6d72aaff8ece9b7ecdbd225742825c09a445227"
|
||||
dependencies = [
|
||||
"cranelift-entity",
|
||||
"wasmtime-internal-core",
|
||||
@@ -1231,9 +1231,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-bitset"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7c1d67aa02b6e174bd2b165c113e94af9498fcc20e2892d0f4d5ab8c9618d09"
|
||||
checksum = "9dd69a6db85c1bcff989809e0e0b3b06506425f32b545c46aeafda5fe7775d6a"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_derive",
|
||||
@@ -1242,9 +1242,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-codegen"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26fe6f3ec5344c32602c414e986dcbe699fa501a3e3e7b02f887d9d12b14ae42"
|
||||
checksum = "24c2db6c26cd96393cf785c4b51b900738963cc7422aa0045416a7641ae2f6cd"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"cranelift-assembler-x64",
|
||||
@@ -1273,9 +1273,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-codegen-meta"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96c5e6323d458486d95781defdb5016a1176fc911d8bc8e64b696adbda6e9044"
|
||||
checksum = "e284270142e7f1dcb73a992a62a8b3716b4062a65a52d8f2732c6ebf6f7f342f"
|
||||
dependencies = [
|
||||
"cranelift-assembler-x64-meta",
|
||||
"cranelift-codegen-shared",
|
||||
@@ -1286,24 +1286,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-codegen-shared"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1260aa93b0bd48e8e55c1c7fd9ff6a260f1a1bc46e1f0151a5055b124e5b15d"
|
||||
checksum = "6595667b7d505cf85d5bdd014e6f57ad6128183238f8e372319d9384782472f5"
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-control"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50c179632a09850f81f1a1e9116cb09330c734a86689f3ee4c3f4ec81543acbd"
|
||||
checksum = "f26ffdbfcd24c3833d730849e6d132af34a400a2b89b44446015c01eecbea21d"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-entity"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8c071188cb1c3b1803e23ae415a8d5f58d741d3a4b26a79b83dd61921112eac"
|
||||
checksum = "9ffb08ccd8a77fb31cdbbda2afa2333d8f85299b1bc0d1c194259ba66d160d74"
|
||||
dependencies = [
|
||||
"cranelift-bitset",
|
||||
"serde",
|
||||
@@ -1313,9 +1313,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-frontend"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2b85ba0a55d7685117b275fe6f36c819d438862e4223d28f0b97902460ff0ac"
|
||||
checksum = "b447e4f2bb44b1188185a77f478e5a91b7723a40b3b58c3e2d5b26df2ed5a665"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"hashbrown 0.17.1",
|
||||
@@ -1326,15 +1326,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-isle"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20ed364edcaed769da7b2709d540f8f7d0ff257749ba193f475e22dba6a0178b"
|
||||
checksum = "2f0989e943f3a9d41989595826bba544df9fda64bcddd4df0c06fb2e26af3cb3"
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-native"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "418d98c3dce08f0d13526692bbd1888bff4c5f45207f5093d168b5a224fbc88c"
|
||||
checksum = "5fa10df59e776c42dae5b6ba5216ba5321707a2136abd2219e615c54b234fc1b"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"libc",
|
||||
@@ -1343,9 +1343,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cranelift-srcgen"
|
||||
version = "0.136.5"
|
||||
version = "0.136.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4f016b9994e39cad68107f33fa5b8dcee8fb7e38332bde3f97690e5e8abe1b10"
|
||||
checksum = "36508559c8839a8b6ee091f9deaa9cfe620a82f1abb5e358a0a0c65290583622"
|
||||
|
||||
[[package]]
|
||||
name = "crc"
|
||||
@@ -4144,7 +4144,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
|
||||
|
||||
[[package]]
|
||||
name = "ide-agent"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4169,7 +4169,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-analysis"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ast-grep-core",
|
||||
"ide-core",
|
||||
@@ -4183,7 +4183,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-android"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4194,7 +4194,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-build"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"chardetng",
|
||||
@@ -4212,7 +4212,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-cli"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"serde",
|
||||
@@ -4226,7 +4226,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-clipboard"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"gtk",
|
||||
"objc2 0.6.5",
|
||||
@@ -4237,7 +4237,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-command"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"heck 0.5.0",
|
||||
"proc-macro2",
|
||||
@@ -4248,7 +4248,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-core"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4265,7 +4265,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-coverage"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-run",
|
||||
@@ -4279,7 +4279,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-dap"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"futures",
|
||||
@@ -4308,7 +4308,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-db"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"bb8",
|
||||
@@ -4346,7 +4346,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-docker"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4359,7 +4359,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-extension"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4380,7 +4380,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-flutter"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-android",
|
||||
"ide-core",
|
||||
@@ -4391,7 +4391,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-fonts"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"objc2-core-foundation",
|
||||
"objc2-core-text",
|
||||
@@ -4403,7 +4403,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-github"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vcs",
|
||||
@@ -4416,7 +4416,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-heap"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4434,7 +4434,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-host"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4509,7 +4509,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-http"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vfs",
|
||||
@@ -4528,7 +4528,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-index"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4550,7 +4550,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jdwp"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-jvm-inspect",
|
||||
"proptest",
|
||||
@@ -4562,7 +4562,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jsonrpc"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"encoding_rs",
|
||||
"futures",
|
||||
@@ -4579,7 +4579,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-attach"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"tempfile",
|
||||
@@ -4588,7 +4588,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-inspect"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"serde",
|
||||
@@ -4599,7 +4599,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-language"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4658,7 +4658,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-lsp"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4686,7 +4686,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-mcp"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"dunce",
|
||||
@@ -4705,7 +4705,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-notebook"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"ide-core",
|
||||
@@ -4728,7 +4728,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-plugin"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4751,7 +4751,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-profiler"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-jvm-attach",
|
||||
@@ -4765,7 +4765,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-remote"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"futures",
|
||||
@@ -4785,7 +4785,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-run"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4809,7 +4809,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-scaffold"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-tools",
|
||||
@@ -4825,7 +4825,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-sdk"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"flate2",
|
||||
@@ -4848,7 +4848,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-search"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"encoding_rs",
|
||||
@@ -4869,7 +4869,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-spell"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"parking_lot",
|
||||
@@ -4882,7 +4882,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-ssh"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"flate2",
|
||||
@@ -4907,7 +4907,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-streams"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-language",
|
||||
@@ -4920,7 +4920,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-syntax"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-language",
|
||||
@@ -4935,7 +4935,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-terminal"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"libc",
|
||||
@@ -4948,7 +4948,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-text"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4961,7 +4961,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-tools"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"hex",
|
||||
@@ -4982,7 +4982,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vcs"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -5003,7 +5003,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vfs"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"chardetng",
|
||||
"dunce",
|
||||
@@ -5029,7 +5029,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-web"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"ide-core",
|
||||
@@ -5045,7 +5045,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-workspace"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -6674,7 +6674,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "openidea"
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -7403,9 +7403,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pulley-interpreter"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d74df9e20cba0f6dd07f01c3140535a6b23e40aecccfcacfb921621b41d0acb"
|
||||
checksum = "335e459f9c7809af04768799880504d014d07e8e2fc6ae682fe2a105d8ced33f"
|
||||
dependencies = [
|
||||
"cranelift-bitset",
|
||||
"log",
|
||||
@@ -7415,9 +7415,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pulley-macros"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8415513bfa407c06de6f11dbe9437f2352e075a5520ff491a131166d3d90aed1"
|
||||
checksum = "dd492ac929a6ca0357362d9fa0a09e31290feac5914550ccfb539b21f89c4b9e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -9759,7 +9759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
||||
dependencies = [
|
||||
"fastrand",
|
||||
"getrandom 0.4.3",
|
||||
"getrandom 0.3.4",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"windows-sys 0.61.2",
|
||||
@@ -11096,9 +11096,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d45bf3b13781b9febb0eef42e1e145146c92ef891f345fd918e0e0fa1568c992"
|
||||
checksum = "f32390bdc8d7cdb6259a1b855178bfed88226b4004b209fd48fb30e0deb01cd3"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
"async-trait",
|
||||
@@ -11138,9 +11138,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-environ"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "833f00f3dc6128159284c5b71e211f24c97d45e052230a14f767fd830a6fb8b0"
|
||||
checksum = "9c10f8ef1c9ee5e0f125c775fe56a4d07b8525db30a96e6358c61d93bd11dee4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"cpp_demangle",
|
||||
@@ -11169,9 +11169,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-component-macro"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d69c34412409072d2e8ec399101524c330e334ff313f77415e6984cc9c6a172"
|
||||
checksum = "620c53182ebd26c9fff5b90dd53cf8ec3103c381403fd32f8d395da31a9e4a46"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro2",
|
||||
@@ -11184,15 +11184,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-component-util"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b168d39f2d6b896d89fe096afa4ccdd7a8e927b01469b590af84f02fca3126a1"
|
||||
checksum = "011e31ca343d9ba0ec623153cd94131b6f03973ef1a0ab791161f642e4a16a93"
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-core"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ad86a65d12c6a9202584ceb658c9a20cf5b25c32eed61c9be5e5f863f88f0d9"
|
||||
checksum = "ab15e50a060b746493e6e95ef3ce4e6e7ebfdd7cc336a7dff0f0277e01b447ef"
|
||||
dependencies = [
|
||||
"hashbrown 0.17.1",
|
||||
"libm",
|
||||
@@ -11201,9 +11201,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-cranelift"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a71f0fd1dd40e4e18d4a20cdba29ff8e0eb2c0f21b12c2eb5869e0fea789dd05"
|
||||
checksum = "dc3d27440a83fba26dd2784a997e13d9acb3606a75fb127c324929b52221c5c5"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"cranelift-control",
|
||||
@@ -11227,9 +11227,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-fiber"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa4dfa39e58735b24ce3d28bfc8c2b3041603cc8a941bb268395351beff90172"
|
||||
checksum = "6e54b28d0d453ca8932e4504065ae66a78f01fcb22b1a2ee287128d732fa9d6f"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
@@ -11241,9 +11241,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-jit-debug"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2eb98d4486c7b0163447d77dea06f3cc87e5e5ba5fc93613f8ec42e27ea181d"
|
||||
checksum = "9293e75a3048b900f7b7c524702abca16d8a2332f970324eefc519f454cd5d69"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"wasmtime-internal-versioned-export-macros",
|
||||
@@ -11251,9 +11251,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-jit-icache-coherence"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852cae234735d79db6c58fe0d04b32f4078ad01fdb3fd6d488ac366132ba9785"
|
||||
checksum = "b852e568831b913d410541bb37edc45a5002e472208fbdbaf844ed801dd4255f"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasmtime-internal-core",
|
||||
@@ -11262,9 +11262,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-unwinder"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9289378c82b9db7e7cf933d6bb441ad968536ac48f3f38c55b7cf9d3e8d87e1"
|
||||
checksum = "a1f7349c9834a542275ad757340079e6453fccb429efce581454d23f85af92c0"
|
||||
dependencies = [
|
||||
"cranelift-codegen",
|
||||
"log",
|
||||
@@ -11274,9 +11274,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-versioned-export-macros"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc5c60c732d99dbcc5d670b71ba6ccf2b015cd16fc828990eaad2c4b8805ebdb"
|
||||
checksum = "30b3e0768a450d9dea3e16b83f2498f0b08db0e32bad695e35564eef017be3f1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -11285,9 +11285,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-internal-wit-bindgen"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c77e4fcc7cd22772578458c5e233df47190ebc9b8b65788797d99a02787c9000"
|
||||
checksum = "b9d085c540b95d0ffebf98c266e6f152e1acf96a9f676f224a74307b9d422c15"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.13.2",
|
||||
@@ -11299,9 +11299,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-wasi"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "705b90d1fa1084cc73df656868948da77711b97f6b895d145a4949f86bcea674"
|
||||
checksum = "17f8ce6b9e77539b5f52d440346f876a84c513ec1b07162845282f8652f7f7f9"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bitflags 2.13.2",
|
||||
@@ -11323,9 +11323,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wasmtime-wasi-io"
|
||||
version = "49.0.5"
|
||||
version = "49.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3d2b6a255be488639f450b380e7e0923789f946de3463696cd30f2fe8a65cc3"
|
||||
checksum = "da9f90eb7ce6edbead27dba3a58843398875defa73b8dce4bbc29d0ce3dc9b40"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes",
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
|
||||
exclude = ["sdk", "plugins"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.48"
|
||||
version = "0.1.49"
|
||||
edition = "2024"
|
||||
rust-version = "1.96"
|
||||
license = "Apache-2.0"
|
||||
|
||||
@@ -60,6 +60,44 @@ Their original copyright headers and Apache-2.0 licensing are retained.
|
||||
|
||||
At render time `src/ui/icons.tsx` may recolour monochrome icons to `currentColor`.
|
||||
|
||||
## Flutter plugin icons
|
||||
|
||||
These icons of [flutter-intellij](https://github.com/flutter/flutter-intellij) (commit `d02813ad5890`) are used
|
||||
under the BSD 3-Clause License:
|
||||
|
||||
- `src/ui/expui/flutter/*.svg`: the DevTools tool window icons, copied unmodified from
|
||||
`resources/icons/expui/`.
|
||||
- `src/ui/expui/flutter/[email protected]` and `[email protected]`: the Flutter outline's widget
|
||||
icons, `resources/icons/custom/[email protected]` and `[email protected]`, renamed, content unmodified.
|
||||
|
||||
```text
|
||||
Copyright 2016 The Chromium Authors. All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the following
|
||||
disclaimer in the documentation and/or other materials provided
|
||||
with the distribution.
|
||||
* Neither the name of Google Inc. nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
```
|
||||
|
||||
## JetBrains IntelliJ Platform VCS log graph algorithms
|
||||
|
||||
`crates/ide-vcs/src/bek.rs` and `src/features/vcs/graph.ts` adapt the Bek ordering,
|
||||
|
||||
@@ -811,7 +811,8 @@ impl AgentManager {
|
||||
Ok(task)
|
||||
}
|
||||
|
||||
/// Creates the task (and its worktree) and sends `req.prompt` as its first message.
|
||||
/// Creates the task (and its worktree) and sends `req.prompt` as its first message, unless
|
||||
/// `req.idle`.
|
||||
pub async fn create(&self, req: NewAgentTask) -> IdeResult<AgentTask> {
|
||||
let spec = self
|
||||
.shared
|
||||
@@ -886,7 +887,7 @@ impl AgentManager {
|
||||
title,
|
||||
provider: spec.id.clone(),
|
||||
model: model_of(&config),
|
||||
status: AgentStatus::Starting,
|
||||
status: if req.idle { AgentStatus::Ready } else { AgentStatus::Starting },
|
||||
isolation: req.isolation,
|
||||
cwd: IpcPath(cwd),
|
||||
branch,
|
||||
@@ -920,11 +921,13 @@ impl AgentManager {
|
||||
title_renamed: false,
|
||||
};
|
||||
let handle = Task::restore(file, self.shared.clone());
|
||||
handle.state.lock().busy = true;
|
||||
handle.state.lock().busy = !req.idle;
|
||||
self.tasks.write().insert(task.id.clone(), handle.clone());
|
||||
handle.emit_task();
|
||||
handle.persist();
|
||||
self.shared.runtime.spawn(async move { handle.run(prompt).await });
|
||||
if !req.idle {
|
||||
self.shared.runtime.spawn(async move { handle.run(prompt).await });
|
||||
}
|
||||
Ok(task)
|
||||
}
|
||||
|
||||
|
||||
@@ -633,6 +633,10 @@ pub struct NewAgentTask {
|
||||
/// Per-session MCP server enable/disable overrides (`server_name` -> `enabled`).
|
||||
#[serde(default)]
|
||||
pub mcp_overrides: BTreeMap<String, bool>,
|
||||
/// Creates the task without sending `prompt` (it only names the task): the composer's
|
||||
/// `!` command runs in it first.
|
||||
#[serde(default)]
|
||||
pub idle: bool,
|
||||
}
|
||||
|
||||
/// A file the task changed: against [`AgentTask::base_commit`], or against `HEAD` in the
|
||||
|
||||
@@ -1420,6 +1420,32 @@ async fn shell_commands_show_in_the_conversation_and_go_with_the_next_message()
|
||||
assert_eq!(sent.pointer("/0/text").and_then(Value::as_str), Some("again"));
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn an_idle_task_starts_no_turn_until_its_first_message() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent::default());
|
||||
let mgr = manager(tmp.path(), agent.clone());
|
||||
let task = mgr
|
||||
.create(NewAgentTask {
|
||||
prompt: text("! echo first"),
|
||||
provider: "claude".into(),
|
||||
isolation: Isolation::Local,
|
||||
idle: true,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!((task.status, task.title.as_str()), (AgentStatus::Ready, "! echo first"));
|
||||
|
||||
mgr.run_shell(&task.id, "echo first", ide_core::CancellationToken::new()).await.unwrap();
|
||||
assert!(agent.prompts.lock().is_empty(), "an idle task starts no turn");
|
||||
mgr.prompt(&task.id, text("again"), false).await.unwrap();
|
||||
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
|
||||
let sent = agent.prompts.lock().last().cloned().unwrap();
|
||||
assert!(sent.pointer("/0/text").and_then(Value::as_str).is_some_and(|t| t.contains("echo first")));
|
||||
assert_eq!(sent.pointer("/1/text").and_then(Value::as_str), Some("again"));
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn send_now_interrupts_the_turn_when_steering_is_refused() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
@@ -4377,6 +4403,7 @@ async fn per_session_mcp_overrides_filter_session_and_reload_when_idle() {
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
mcp_overrides: BTreeMap::from([("slack".into(), false)]),
|
||||
idle: false,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
@@ -4504,6 +4531,7 @@ async fn copilot_falls_back_to_acp_when_headless_probe_session_or_prompt_fails()
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
mcp_overrides: BTreeMap::new(),
|
||||
idle: false,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
@@ -4528,6 +4556,7 @@ async fn copilot_falls_back_to_acp_when_headless_probe_session_or_prompt_fails()
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
mcp_overrides: BTreeMap::new(),
|
||||
idle: false,
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
@@ -25,7 +25,8 @@ pub use gradle_deps::{GradleDependency, GradleReport, gradle_dependencies, gradl
|
||||
pub use maven::{MavenDependency, MavenModel, MavenPlugin, MavenProfile, MavenProject, Omission};
|
||||
pub use sbt::{SbtBuild, SbtProject};
|
||||
pub use sync::{
|
||||
SyncOptions, SyncProgress, maven_profiles, save_maven_profiles, sync_gradle, sync_gradle_model, sync_maven,
|
||||
SyncOptions, SyncProgress, maven_offline, maven_profiles, save_maven_offline, save_maven_profiles, sync_gradle,
|
||||
sync_gradle_model, sync_maven,
|
||||
};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
@@ -163,7 +163,13 @@ fn run_with_env_capture(
|
||||
let encoding =
|
||||
ide_core::output_encoding::fix(program, args, env, |k| std::env::var(k).ok(), "UTF-8", cfg!(windows));
|
||||
let program = program_path(program, env, cwd);
|
||||
let mut command = Command::new(&program);
|
||||
let mut command = if ide_core::process::needs_sh(&program) {
|
||||
let mut sh = Command::new("/bin/sh");
|
||||
sh.arg(&program);
|
||||
sh
|
||||
} else {
|
||||
Command::new(&program)
|
||||
};
|
||||
command.args(args).current_dir(cwd).envs(env).envs(encoding.env.iter().map(|(k, v)| (k, v))).stdin(Stdio::null());
|
||||
command.stdout(Stdio::piped()).stderr(Stdio::piped());
|
||||
// Its own group: `mvnw` / `gradlew` start the JVM as a child, and cancelling kills both.
|
||||
|
||||
@@ -86,15 +86,20 @@ const MAVEN_CACHE_VERSION: u32 = 1;
|
||||
|
||||
/// `dependency:tree` of a plugin version whose `-Dverbose` lists the occurrences Maven
|
||||
/// omitted (conflicts, duplicates): verbose output was dropped in 3.0 and is back since 3.2.
|
||||
/// Offline, the project's own plugin version is used instead, since this one may not be cached.
|
||||
/// Offline, it is used only when an earlier sync downloaded it; otherwise the project's own
|
||||
/// plugin version is, which may be cached instead.
|
||||
const DEPENDENCY_TREE: &str = "org.apache.maven.plugins:maven-dependency-plugin:3.8.1:tree";
|
||||
const DEPENDENCY_TREE_JAR: &str =
|
||||
"org/apache/maven/plugins/maven-dependency-plugin/3.8.1/maven-dependency-plugin-3.8.1.jar";
|
||||
|
||||
/// The goals that read the effective POM into `effective` and the verbose dependency trees.
|
||||
fn maven_sync_goals(effective: &Path, offline: bool) -> Vec<String> {
|
||||
/// The goals that read the effective POM into `effective` and the verbose dependency trees;
|
||||
/// `repo` is the local repository the build resolves from.
|
||||
fn maven_sync_goals(effective: &Path, offline: bool, repo: Option<&Path>) -> Vec<String> {
|
||||
let pinned = !offline || repo.is_some_and(|repo| repo.join(DEPENDENCY_TREE_JAR).is_file());
|
||||
vec![
|
||||
"help:effective-pom".into(),
|
||||
format!("-Doutput={}", effective.to_string_lossy()),
|
||||
if offline { "dependency:tree".into() } else { DEPENDENCY_TREE.into() },
|
||||
if pinned { DEPENDENCY_TREE.into() } else { "dependency:tree".into() },
|
||||
"-Dverbose".into(),
|
||||
]
|
||||
}
|
||||
@@ -118,6 +123,7 @@ fn sync_maven_options(options: &[String]) -> Vec<String> {
|
||||
}
|
||||
const GRADLE_CACHE: &str = "gradle.json";
|
||||
const MAVEN_PROFILES: &str = "maven-profiles.json";
|
||||
const MAVEN_OFFLINE: &str = "maven-offline.json";
|
||||
|
||||
/// The Maven profiles (`-P` entries, `!id` deactivates) the project was last synced
|
||||
/// with: what the IDE resolves it with besides `mvn` (the Java language server, Build Project).
|
||||
@@ -127,12 +133,31 @@ pub fn maven_profiles(cache_dir: &Path) -> Vec<String> {
|
||||
|
||||
/// Records the profiles of a sync for [`maven_profiles`]; `true` when they changed.
|
||||
pub fn save_maven_profiles(cache_dir: &Path, profiles: &[String]) -> IdeResult<bool> {
|
||||
if maven_profiles(cache_dir) == profiles {
|
||||
save_if_changed(cache_dir, MAVEN_PROFILES, &profiles.to_vec())
|
||||
}
|
||||
|
||||
/// Whether the project was last synced offline (`-o`): the Java language server then
|
||||
/// resolves it offline too.
|
||||
pub fn maven_offline(cache_dir: &Path) -> bool {
|
||||
read_cache(cache_dir, MAVEN_OFFLINE).unwrap_or(false)
|
||||
}
|
||||
|
||||
/// Records the offline mode of a sync for [`maven_offline`]; `true` when it changed.
|
||||
pub fn save_maven_offline(cache_dir: &Path, offline: bool) -> IdeResult<bool> {
|
||||
save_if_changed(cache_dir, MAVEN_OFFLINE, &offline)
|
||||
}
|
||||
|
||||
fn save_if_changed<T: Serialize + DeserializeOwned + PartialEq + Default>(
|
||||
dir: &Path,
|
||||
name: &str,
|
||||
value: &T,
|
||||
) -> IdeResult<bool> {
|
||||
if read_cache::<T>(dir, name).unwrap_or_default() == *value {
|
||||
return Ok(false);
|
||||
}
|
||||
std::fs::create_dir_all(cache_dir)?;
|
||||
let json = serde_json::to_vec(profiles).map_err(|e| IdeError::internal(e.to_string()))?;
|
||||
std::fs::write(cache_dir.join(MAVEN_PROFILES), json)?;
|
||||
std::fs::create_dir_all(dir)?;
|
||||
let json = serde_json::to_vec(value).map_err(|e| IdeError::internal(e.to_string()))?;
|
||||
std::fs::write(dir.join(name), json)?;
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
@@ -382,7 +407,8 @@ pub fn sync_maven(
|
||||
if !options.profiles.is_empty() {
|
||||
args.push(format!("-P{}", options.profiles.join(",")));
|
||||
}
|
||||
args.extend(maven_sync_goals(&effective, options.offline));
|
||||
let repo = local_repo.clone().or_else(maven::default_local_repo);
|
||||
args.extend(maven_sync_goals(&effective, options.offline, repo.as_deref()));
|
||||
progress(SyncProgress { message: format!("Reading {}", top.display_name), fraction: None });
|
||||
let command = options.maven_command.as_deref().unwrap_or(&top.command);
|
||||
let out = run(command, &args, &root.join(&top.dir), &options.env, cancel, |line| {
|
||||
@@ -532,14 +558,18 @@ mod tests {
|
||||
assert!(loaded.gradle[0].sync_error.as_deref().unwrap().contains("cannot start"));
|
||||
assert!(loaded.gradle[1].sync_error.is_none());
|
||||
assert_eq!(loaded.gradle[1].projects[0].tasks[0].name, "healthy");
|
||||
let bad_wrapper = root.join("a/gradlew");
|
||||
std::fs::write(&bad_wrapper, "#!/bin/sh\nexit 0\n").unwrap();
|
||||
std::fs::set_permissions(&bad_wrapper, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
models[0].command = bad_wrapper.to_string_lossy().into_owned();
|
||||
// A wrapper without the execute bit (committed from Windows, unpacked from a zip)
|
||||
// runs through `sh`, and its mode is left alone.
|
||||
let plain_wrapper = root.join("a/gradlew");
|
||||
std::fs::write(&plain_wrapper, "#!/bin/sh\nprintf '%s\\n' 'Build tasks' '-----------' 'plain - ok'\n").unwrap();
|
||||
std::fs::set_permissions(&plain_wrapper, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
models[0].command = plain_wrapper.to_string_lossy().into_owned();
|
||||
run(&models[0]).unwrap();
|
||||
let loaded = crate::load_linked(root, &cache, None, &Default::default(), &settings);
|
||||
assert!(loaded.gradle[0].sync_error.as_deref().unwrap().contains("cannot start"));
|
||||
assert!(loaded.gradle[0].sync_error.is_none());
|
||||
assert_eq!(loaded.gradle[0].projects[0].tasks[0].name, "plain");
|
||||
assert!(loaded.gradle[1].sync_error.is_none());
|
||||
assert_eq!(std::fs::metadata(&plain_wrapper).unwrap().permissions().mode() & 0o777, 0o644);
|
||||
let blocked_cache = root.join("blocked-cache");
|
||||
std::fs::write(&blocked_cache, "a file cannot contain sync caches").unwrap();
|
||||
assert!(
|
||||
@@ -908,12 +938,31 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sync_reads_verbose_trees_with_a_pinned_plugin_unless_offline() {
|
||||
let online = maven_sync_goals(Path::new("e.xml"), false);
|
||||
fn the_offline_mode_of_the_last_sync_is_kept_for_the_language_server() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let cache = tmp.path().join("cache");
|
||||
assert!(!maven_offline(&cache), "never synced: online");
|
||||
assert!(save_maven_offline(&cache, true).unwrap());
|
||||
assert!(maven_offline(&cache));
|
||||
assert!(!save_maven_offline(&cache, true).unwrap(), "unchanged");
|
||||
assert!(save_maven_offline(&cache, false).unwrap());
|
||||
assert!(!maven_offline(&cache));
|
||||
assert!(!save_maven_offline(&tmp.path().join("other"), false).unwrap(), "online is the default");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn sync_reads_verbose_trees_with_a_pinned_plugin_unless_offline_without_it() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let online = maven_sync_goals(Path::new("e.xml"), false, None);
|
||||
assert_eq!(online, ["help:effective-pom", "-Doutput=e.xml", DEPENDENCY_TREE, "-Dverbose"]);
|
||||
let offline = maven_sync_goals(Path::new("e.xml"), true);
|
||||
let offline = maven_sync_goals(Path::new("e.xml"), true, Some(tmp.path()));
|
||||
assert_eq!(offline[2], "dependency:tree");
|
||||
assert!(offline.contains(&"-Dverbose".to_owned()));
|
||||
// Downloaded by an online sync: offline keeps using it, the project's version may be missing.
|
||||
let jar = tmp.path().join(DEPENDENCY_TREE_JAR);
|
||||
std::fs::create_dir_all(jar.parent().unwrap()).unwrap();
|
||||
std::fs::write(&jar, "").unwrap();
|
||||
assert_eq!(maven_sync_goals(Path::new("e.xml"), true, Some(tmp.path()))[2], DEPENDENCY_TREE);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -965,6 +1014,28 @@ mod tests {
|
||||
assert!(sync_maven_options(&[]).is_empty());
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn maven_sync_runs_a_wrapper_without_the_execute_bit() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let root = tmp.path().join("p");
|
||||
std::fs::create_dir_all(&root).unwrap();
|
||||
std::fs::write(root.join("pom.xml"), "<project><groupId>g</groupId><artifactId>a</artifactId></project>")
|
||||
.unwrap();
|
||||
let mvnw = root.join("mvnw");
|
||||
std::fs::write(&mvnw, "#!/bin/sh\nprintf '%s\\n' \"$@\" > mvnw-args\n").unwrap();
|
||||
std::fs::set_permissions(&mvnw, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
let cache = tmp.path().join("cache");
|
||||
sync_maven(&root, &cache, &SyncOptions::default(), &CancellationToken::new(), &|_| {}).unwrap();
|
||||
let args = std::fs::read_to_string(root.join("mvnw-args")).unwrap();
|
||||
assert!(args.contains("help:effective-pom"), "args: {args}");
|
||||
let loaded = crate::load_linked(&root, &cache, None, &Default::default(), &Default::default());
|
||||
let maven = loaded.maven.unwrap();
|
||||
assert!(maven.synced_at.is_some() && maven.sync_error.is_none(), "{:?}", maven.sync_error);
|
||||
assert_eq!(std::fs::metadata(&mvnw).unwrap().permissions().mode() & 0o777, 0o644);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn maven_sync_runs_the_daemon_command_serially() {
|
||||
|
||||
@@ -312,6 +312,8 @@ pub enum LspRefreshKind {
|
||||
InlayHints,
|
||||
SemanticTokens,
|
||||
CodeLens,
|
||||
/// The Dart server published a document's Flutter outline.
|
||||
FlutterOutline,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||
@@ -370,6 +372,18 @@ pub enum DebugEvent {
|
||||
/// `flutter debug_adapter`'s `flutter.appStarted` event (launch and attach): the session is
|
||||
/// a Flutter app that can take a hot reload now. The plain Dart adapter never sends it.
|
||||
FlutterAppStarted,
|
||||
/// The VM Service of a Flutter session's app, which DevTools connects to.
|
||||
FlutterVmService {
|
||||
uri: String,
|
||||
/// The Flutter device the app runs on.
|
||||
device: Option<String>,
|
||||
},
|
||||
/// Flutter's inspector selected a widget: its source, 0-based.
|
||||
FlutterNavigate {
|
||||
path: crate::IpcPath,
|
||||
line: u32,
|
||||
column: u32,
|
||||
},
|
||||
/// The session's capabilities changed after it started: fetch them again.
|
||||
Capabilities,
|
||||
/// The adapter's `invalidated` event: what it shows for `areas` (`all`, `stacks`, `threads`,
|
||||
|
||||
@@ -807,6 +807,27 @@ pub fn find_executable_in(
|
||||
.find_map(|dir| names.iter().map(|n| dir.join(n)).find(|p| p.is_file()))
|
||||
}
|
||||
|
||||
/// Whether `program` is a script to start as `/bin/sh <program>`: on Unix, a `#!` script
|
||||
/// without the execute bit — a `mvnw` / `gradlew` committed from Windows or unpacked from a
|
||||
/// zip — which `exec` refuses with `EACCES`. The file's mode is left alone, as other IDEs do.
|
||||
pub fn needs_sh(program: &std::path::Path) -> bool {
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::io::Read;
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let mut magic = [0u8; 2];
|
||||
program.is_absolute()
|
||||
&& std::fs::metadata(program).is_ok_and(|m| m.is_file() && m.permissions().mode() & 0o111 == 0)
|
||||
&& std::fs::File::open(program).and_then(|mut f| f.read_exact(&mut magic)).is_ok()
|
||||
&& &magic == b"#!"
|
||||
}
|
||||
#[cfg(not(unix))]
|
||||
{
|
||||
let _ = program;
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/// [`find_executable_in`] for this platform (`PATHEXT` from the environment).
|
||||
pub fn find_executable(name: &str, search: &OsStr) -> Option<std::path::PathBuf> {
|
||||
let pathext = host_var_os("PATHEXT");
|
||||
|
||||
@@ -239,6 +239,8 @@ pub enum SymbolKind {
|
||||
Event,
|
||||
Operator,
|
||||
Key,
|
||||
/// A Flutter widget built in the code (Flutter outline only).
|
||||
Widget,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
|
||||
@@ -420,6 +420,22 @@ fn add_flutter_device(arguments: &mut Value, device: Value) {
|
||||
}
|
||||
}
|
||||
|
||||
/// The source a `navigate` tool event points at (1-based there). A `package:` location comes
|
||||
/// with the file the adapter resolved it to.
|
||||
fn flutter_navigation(body: &Value) -> Option<ide_core::event::DebugEvent> {
|
||||
if body.get("kind")?.as_str()? != "navigate" {
|
||||
return None;
|
||||
}
|
||||
let data = body.get("data")?;
|
||||
let uri = data.get("resolvedFileUri").or_else(|| data.get("fileUri"))?.as_str()?;
|
||||
let position = |key| data.get(key)?.as_u64().map(|n| n.saturating_sub(1) as u32);
|
||||
Some(ide_core::event::DebugEvent::FlutterNavigate {
|
||||
path: kotlin_lsp::source_path(uri)?.into(),
|
||||
line: position("line")?,
|
||||
column: position("column").unwrap_or(0),
|
||||
})
|
||||
}
|
||||
|
||||
fn no_session(s: DebugSessionId) -> IdeError {
|
||||
IdeError::not_found(format!("no debug session {}", s.0))
|
||||
}
|
||||
|
||||
@@ -99,6 +99,9 @@ pub(crate) struct Session {
|
||||
pub js_overrides: tokio::sync::Mutex<Option<tokio::sync::watch::Sender<Vec<crate::JsResponseRule>>>>,
|
||||
/// The file js-debug records the page's CPU profile into, while one is being recorded.
|
||||
pub js_profile: parking_lot::Mutex<Option<std::path::PathBuf>>,
|
||||
/// The device of the app `flutter debug_adapter` announced, once it did: the Dart adapter
|
||||
/// sends the same `dart.*` events.
|
||||
pub flutter_app: std::sync::OnceLock<Option<String>>,
|
||||
pub jvm_inspector: parking_lot::Mutex<Option<Arc<dyn ide_jvm_inspect::JvmInspector>>>,
|
||||
/// One inspector request per session at a time.
|
||||
pub inspect_lock: tokio::sync::Mutex<()>,
|
||||
@@ -274,6 +277,7 @@ impl Session {
|
||||
launch_type: std::sync::OnceLock::new(),
|
||||
js_overrides: tokio::sync::Mutex::new(None),
|
||||
js_profile: parking_lot::Mutex::new(None),
|
||||
flutter_app: std::sync::OnceLock::new(),
|
||||
jvm_inspector: parking_lot::Mutex::new(None),
|
||||
inspect_lock: tokio::sync::Mutex::default(),
|
||||
ended: ide_core::CancellationToken::new(),
|
||||
@@ -898,6 +902,20 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
|
||||
"profileStarted" => {
|
||||
*s.js_profile.lock() = str_("file").map(std::path::PathBuf::from);
|
||||
}
|
||||
// Sent before `dart.debuggerUris`, for `launch` and `attach` alike.
|
||||
"flutter.appStart" => {
|
||||
let _ = s.flutter_app.set(str_("deviceId"));
|
||||
}
|
||||
"dart.debuggerUris" => {
|
||||
if let (Some(device), Some(uri)) = (s.flutter_app.get(), str_("vmServiceUri")) {
|
||||
s.emit(DebugEvent::FlutterVmService { uri, device: device.clone() });
|
||||
}
|
||||
}
|
||||
"dart.toolEvent" if s.flutter_app.get().is_some() => {
|
||||
if let Some(event) = crate::flutter_navigation(&body) {
|
||||
s.emit(event);
|
||||
}
|
||||
}
|
||||
_ => tracing::trace!("dap: ignored event {event}"),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -572,6 +572,20 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
|
||||
json!({"type": "event", "event": "hotcodereplace", "body": {"changeType": 3, "message": "Build completed"}})
|
||||
);
|
||||
}
|
||||
"hotRestart" => {
|
||||
ok!(msg, Value::Null);
|
||||
let uris = json!({"vmServiceUri": "ws://127.0.0.1:1/t=/ws"});
|
||||
let navigate =
|
||||
|file: &str| json!({"kind": "navigate", "data": {"fileUri": file, "line": 3, "column": 5}});
|
||||
// Not Flutter's yet: a plain Dart session sends these too.
|
||||
send!(json!({"type": "event", "event": "dart.debuggerUris", "body": uris}));
|
||||
send!(json!({"type": "event", "event": "dart.toolEvent", "body": navigate("file:///early.dart")}));
|
||||
send!(json!({"type": "event", "event": "flutter.appStart", "body": {"deviceId": "d1"}}));
|
||||
send!(json!({"type": "event", "event": "dart.debuggerUris", "body": uris}));
|
||||
send!(json!({"type": "event", "event": "dart.toolEvent", "body": {"kind": "other", "data": {}}}));
|
||||
send!(json!({"type": "event", "event": "dart.toolEvent", "body": navigate("package:a/a.dart")}));
|
||||
send!(json!({"type": "event", "event": "dart.toolEvent", "body": navigate("file:///a%20b/main.dart")}));
|
||||
}
|
||||
"terminate" => {
|
||||
ok!(msg, Value::Null);
|
||||
send!(json!({"type": "event", "event": "terminated"}));
|
||||
@@ -1906,6 +1920,27 @@ async fn hot_reload_sends_its_reason_and_reports_the_flutter_app() {
|
||||
h.wait_event(|e| matches!(e, DebugEvent::FlutterAppStarted)).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn flutter_events_need_a_flutter_app() {
|
||||
let h = harness(Script::default());
|
||||
let id = h.start(config()).await.unwrap();
|
||||
h.manager.hot_restart(id).await.unwrap();
|
||||
let navigate = h.wait_event(|e| matches!(e, DebugEvent::FlutterNavigate { .. })).await;
|
||||
let DebugEvent::FlutterNavigate { path, line, column } = navigate else { unreachable!() };
|
||||
assert_eq!((path.as_ref(), line, column), (Path::new("/a b/main.dart"), 2, 4));
|
||||
let events = h.events.lock();
|
||||
let count = |want: fn(&DebugEvent) -> bool| {
|
||||
events.iter().filter(|e| matches!(e, IdeEvent::Debug { event, .. } if want(event))).count()
|
||||
};
|
||||
assert_eq!(
|
||||
count(
|
||||
|e| matches!(e, DebugEvent::FlutterVmService { uri, device } if uri == "ws://127.0.0.1:1/t=/ws" && device.as_deref() == Some("d1"))
|
||||
),
|
||||
1
|
||||
);
|
||||
assert_eq!(count(|e| matches!(e, DebugEvent::FlutterNavigate { .. })), 1);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn hot_swap_only_for_java_debug() {
|
||||
let h = harness(Script::default());
|
||||
|
||||
@@ -248,6 +248,17 @@ fn legacy_eof(e: &sqlx::Error) -> bool {
|
||||
matches!(e, sqlx::Error::Protocol(msg) if msg.starts_with("OK_Packet too short"))
|
||||
}
|
||||
|
||||
/// A TLS handshake that failed, e.g. with a server limited to TLS 1.0/1.1. SSL mode Prefer means
|
||||
/// TLS when it works, else a plain connection, as libpq's `sslmode=prefer` and MySQL clients'
|
||||
/// PREFERRED do; sqlx only goes plain when the server offers no TLS, so such errors are retried.
|
||||
fn tls_failed(e: &sqlx::Error) -> bool {
|
||||
match e {
|
||||
sqlx::Error::Tls(_) => true,
|
||||
sqlx::Error::Io(io) => io.get_ref().is_some_and(|inner| inner.is::<rustls::Error>()),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn db_err(e: sqlx::Error) -> IdeError {
|
||||
match &e {
|
||||
sqlx::Error::Database(d) => {
|
||||
@@ -832,9 +843,17 @@ impl Pool {
|
||||
if let Some(n) = setup.statement_cache {
|
||||
opts = opts.statement_cache_capacity(n);
|
||||
}
|
||||
let manager = PgManager { options: opts, init: init.clone(), timeout };
|
||||
let mut manager = PgManager { options: opts, init: init.clone(), timeout };
|
||||
// Open once directly so authentication failures retain their database error.
|
||||
let first = manager.connect().await.map_err(db_err)?;
|
||||
let first = match manager.connect().await {
|
||||
Err(e) if source.ssl == DbSslMode::Prefer && tls_failed(&e) => {
|
||||
tracing::info!("TLS handshake failed, connecting without TLS (SSL mode Prefer): {e}");
|
||||
manager.options = manager.options.clone().ssl_mode(PgSslMode::Disable);
|
||||
manager.connect().await
|
||||
}
|
||||
first => first,
|
||||
}
|
||||
.map_err(db_err)?;
|
||||
let pool = Bb8Pool::builder().max_size(MAX).connection_timeout(timeout).build_unchecked(manager);
|
||||
let _ = pool.add(first);
|
||||
Ok(Pool::Postgres(ServerPool { inner: pool, closed: AtomicBool::new(false) }))
|
||||
@@ -883,14 +902,19 @@ impl Pool {
|
||||
}
|
||||
let mut manager = MysqlManager { options: opts, init: init.clone(), timeout };
|
||||
// Open once directly so authentication failures retain their database error.
|
||||
let first = match manager.connect().await {
|
||||
Err(e) if legacy_eof(&e) => {
|
||||
manager.options = manager.options.clone().deprecate_eof(false);
|
||||
manager.connect().await
|
||||
let mut first = manager.connect().await;
|
||||
if source.ssl == DbSslMode::Prefer && first.as_ref().is_err_and(tls_failed) {
|
||||
if let Err(e) = &first {
|
||||
tracing::info!("TLS handshake failed, connecting without TLS (SSL mode Prefer): {e}");
|
||||
}
|
||||
first => first,
|
||||
manager.options = manager.options.clone().ssl_mode(MySqlSslMode::Disabled);
|
||||
first = manager.connect().await;
|
||||
}
|
||||
.map_err(db_err)?;
|
||||
if first.as_ref().is_err_and(legacy_eof) {
|
||||
manager.options = manager.options.clone().deprecate_eof(false);
|
||||
first = manager.connect().await;
|
||||
}
|
||||
let first = first.map_err(db_err)?;
|
||||
let pool = Bb8Pool::builder().max_size(MAX).connection_timeout(timeout).build_unchecked(manager);
|
||||
let _ = pool.add(first);
|
||||
Ok(Pool::Mysql(ServerPool { inner: pool, closed: AtomicBool::new(false) }))
|
||||
@@ -1406,6 +1430,19 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::source::{DbOptions, DbProperty};
|
||||
|
||||
#[test]
|
||||
fn prefer_retries_without_tls_only_after_a_failed_handshake() {
|
||||
use std::io;
|
||||
// What a server limited to old TLS versions gives: rustls's alert inside the I/O error.
|
||||
let alert = rustls::Error::AlertReceived(rustls::AlertDescription::HandshakeFailure);
|
||||
assert!(tls_failed(&sqlx::Error::Io(io::Error::new(io::ErrorKind::InvalidData, alert))));
|
||||
assert!(tls_failed(&sqlx::Error::Tls("bad config".into())));
|
||||
// Unreachable servers, protocol errors and wrong passwords keep their error.
|
||||
assert!(!tls_failed(&sqlx::Error::Io(io::ErrorKind::ConnectionRefused.into())));
|
||||
assert!(!tls_failed(&sqlx::Error::Io(io::Error::new(io::ErrorKind::InvalidData, "eof"))));
|
||||
assert!(!tls_failed(&sqlx::Error::Protocol("OK_Packet too short".into())));
|
||||
}
|
||||
|
||||
fn sqlserver_debug(ssl: DbSslMode) -> String {
|
||||
let mut config = tiberius::Config::new();
|
||||
apply_sqlserver_ssl(&mut config, ssl);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "ide-flutter"
|
||||
description = "Flutter devices, kept current by the `flutter daemon` protocol"
|
||||
description = "Flutter devices from the `flutter daemon` protocol, and the project's DevTools server"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
|
||||
@@ -0,0 +1,299 @@
|
||||
//! One `dart devtools` server per project window, started when first asked for. In `--machine`
|
||||
//! mode it reports its port as a `server.started` line on stdout. A server that fails or exits
|
||||
//! is not restarted on its own: the next request starts a new one.
|
||||
|
||||
use crate::{KILL_GRACE, OUTPUT_TAIL, keep_output, read_lines, spawn_watched};
|
||||
use ide_core::process::{kill_tree, terminate_tree};
|
||||
use ide_core::tool_path::{find_command, search_path_in};
|
||||
use parking_lot::{Condvar, Mutex};
|
||||
use serde_json::Value;
|
||||
use std::collections::VecDeque;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::Child;
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
const START_TIMEOUT: Duration = Duration::from_secs(60);
|
||||
/// The address embedded pages are allowed to come from, so never `localhost`.
|
||||
const HOST: &str = "127.0.0.1";
|
||||
const ARGS: [&str; 7] = ["devtools", "--machine", "--allow-embedding", "--host", HOST, "--port", "0"];
|
||||
|
||||
fn started_port(line: &str) -> Option<u16> {
|
||||
let message: Value = serde_json::from_str(line.trim()).ok()?;
|
||||
if message.get("event")?.as_str()? != "server.started" {
|
||||
return None;
|
||||
}
|
||||
u16::try_from(message.get("params")?.get("port")?.as_u64()?).ok()
|
||||
}
|
||||
|
||||
/// The `dart` of the SDK `flutter` belongs to, so that DevTools matches the debugged app.
|
||||
fn dart_executable(root: &Path) -> Option<PathBuf> {
|
||||
let path = search_path_in(root);
|
||||
find_command("flutter", &path, root)
|
||||
.and_then(|flutter| {
|
||||
// On the search path `flutter` is often a link into the SDK.
|
||||
let flutter = if cfg!(unix) { std::fs::canonicalize(&flutter).unwrap_or(flutter) } else { flutter };
|
||||
let dart = flutter.with_file_name(if cfg!(windows) { "dart.bat" } else { "dart" });
|
||||
dart.is_file().then_some(dart)
|
||||
})
|
||||
.or_else(|| find_command("dart", &path, root))
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
enum Status {
|
||||
#[default]
|
||||
Stopped,
|
||||
Starting,
|
||||
Ready(String),
|
||||
Failed(String),
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct State {
|
||||
/// Bumped by every start and stop: a reader of an older process no longer has a say.
|
||||
generation: u64,
|
||||
child: Option<Child>,
|
||||
status: Status,
|
||||
}
|
||||
|
||||
impl State {
|
||||
fn shut_down(&mut self) {
|
||||
self.generation += 1;
|
||||
if let Some(mut child) = self.child.take() {
|
||||
std::thread::spawn(move || terminate_tree(&mut child, KILL_GRACE));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct Shared {
|
||||
root: PathBuf,
|
||||
/// Replaces the lookup on the search path (tests).
|
||||
executable: Option<PathBuf>,
|
||||
timeout: Duration,
|
||||
state: Mutex<State>,
|
||||
changed: Condvar,
|
||||
}
|
||||
|
||||
impl Shared {
|
||||
/// Applies `status` unless this process was replaced or stopped; false if it was.
|
||||
fn set(&self, generation: u64, status: Status) -> bool {
|
||||
let mut state = self.state.lock();
|
||||
if state.generation != generation {
|
||||
return false;
|
||||
}
|
||||
state.status = status;
|
||||
self.changed.notify_all();
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
pub struct DevToolsServer(Arc<Shared>);
|
||||
|
||||
impl DevToolsServer {
|
||||
pub fn new(root: PathBuf) -> Self {
|
||||
Self::with_executable(root, None, START_TIMEOUT)
|
||||
}
|
||||
|
||||
fn with_executable(root: PathBuf, executable: Option<PathBuf>, timeout: Duration) -> Self {
|
||||
Self(Arc::new(Shared { root, executable, timeout, state: Mutex::default(), changed: Condvar::new() }))
|
||||
}
|
||||
|
||||
/// The server's address, starting it if none runs. Blocks until it is known.
|
||||
pub fn url(&self) -> Result<String, String> {
|
||||
let shared = &self.0;
|
||||
let deadline = Instant::now() + shared.timeout;
|
||||
let mut state = shared.state.lock();
|
||||
if matches!(state.status, Status::Stopped | Status::Failed(_)) {
|
||||
state.generation += 1;
|
||||
state.status = Status::Starting;
|
||||
let (shared, generation) = (shared.clone(), state.generation);
|
||||
std::thread::spawn(move || run(&shared, generation));
|
||||
}
|
||||
loop {
|
||||
match &state.status {
|
||||
Status::Ready(url) => return Ok(url.clone()),
|
||||
Status::Failed(message) => return Err(message.clone()),
|
||||
Status::Stopped => return Err("Flutter DevTools was stopped".into()),
|
||||
Status::Starting => {}
|
||||
}
|
||||
if shared.changed.wait_until(&mut state, deadline).timed_out() {
|
||||
state.shut_down();
|
||||
let message = "Flutter DevTools did not start in time".to_owned();
|
||||
state.status = Status::Failed(message.clone());
|
||||
shared.changed.notify_all();
|
||||
return Err(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Ends the server (project closed, or no longer trusted).
|
||||
pub fn stop(&self) {
|
||||
let mut state = self.0.state.lock();
|
||||
state.shut_down();
|
||||
state.status = Status::Stopped;
|
||||
self.0.changed.notify_all();
|
||||
}
|
||||
|
||||
/// Ends the server before returning, for a process about to exit.
|
||||
pub fn kill(&self) {
|
||||
let mut state = self.0.state.lock();
|
||||
state.generation += 1;
|
||||
state.status = Status::Stopped;
|
||||
if let Some(mut child) = state.child.take() {
|
||||
kill_tree(&mut child);
|
||||
}
|
||||
self.0.changed.notify_all();
|
||||
}
|
||||
}
|
||||
|
||||
/// One server's whole life, on its own thread.
|
||||
fn run(shared: &Arc<Shared>, generation: u64) {
|
||||
let fail = |message: String| {
|
||||
shared.set(generation, Status::Failed(message));
|
||||
};
|
||||
let Some(executable) = shared.executable.clone().or_else(|| dart_executable(&shared.root)) else {
|
||||
return fail("Dart SDK not found: install Flutter or add it to PATH".into());
|
||||
};
|
||||
let mut child = match spawn_watched(&executable, &ARGS, &shared.root) {
|
||||
Ok(child) => child,
|
||||
Err(e) => return fail(format!("could not run {}: {e}", executable.display())),
|
||||
};
|
||||
let (Some(stdout), Some(stderr)) = (child.stdout.take(), child.stderr.take()) else {
|
||||
terminate_tree(&mut child, Duration::ZERO);
|
||||
return fail("no output pipe".into());
|
||||
};
|
||||
{
|
||||
let mut state = shared.state.lock();
|
||||
if state.generation != generation {
|
||||
drop(state);
|
||||
terminate_tree(&mut child, KILL_GRACE);
|
||||
return;
|
||||
}
|
||||
state.child = Some(child);
|
||||
}
|
||||
let tail = Arc::new(Mutex::new(VecDeque::with_capacity(OUTPUT_TAIL)));
|
||||
let errors = {
|
||||
let tail = tail.clone();
|
||||
std::thread::spawn(move || {
|
||||
read_lines(stderr, |line| {
|
||||
keep_output(&tail, line);
|
||||
true
|
||||
});
|
||||
})
|
||||
};
|
||||
read_lines(stdout, |line| match started_port(line) {
|
||||
Some(port) => shared.set(generation, Status::Ready(format!("http://{HOST}:{port}"))),
|
||||
None => {
|
||||
keep_output(&tail, line);
|
||||
true
|
||||
}
|
||||
});
|
||||
let _ = errors.join();
|
||||
|
||||
let mut state = shared.state.lock();
|
||||
if state.generation != generation {
|
||||
return;
|
||||
}
|
||||
let child = state.child.take();
|
||||
state.status = if matches!(state.status, Status::Ready(_)) {
|
||||
Status::Stopped
|
||||
} else {
|
||||
let message = Vec::from(std::mem::take(&mut *tail.lock())).join("\n");
|
||||
Status::Failed(if message.is_empty() { "dart devtools exited".into() } else { message })
|
||||
};
|
||||
shared.changed.notify_all();
|
||||
drop(state);
|
||||
if let Some(mut child) = child {
|
||||
std::thread::spawn(move || terminate_tree(&mut child, Duration::ZERO));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn only_server_started_gives_a_port() {
|
||||
let line =
|
||||
r#"{"event":"server.started","method":"server.started","params":{"host":"127.0.0.1","port":9100,"pid":1}}"#;
|
||||
assert_eq!(started_port(line), Some(9100));
|
||||
assert_eq!(started_port(r#"{"event":"server.dtdStarted","params":{"uri":"ws://x"}}"#), None);
|
||||
assert_eq!(started_port("Serving DevTools"), None);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
mod process {
|
||||
use super::*;
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
const STARTED: &str = r#"echo '{"event":"server.started","params":{"port":4242}}'"#;
|
||||
|
||||
fn server(dir: &Path, script: &str, timeout: Duration) -> DevToolsServer {
|
||||
let path = dir.join("dart");
|
||||
std::fs::write(&path, format!("#!/bin/sh\necho run >> runs\n{script}")).unwrap();
|
||||
std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||
DevToolsServer::with_executable(dir.to_owned(), Some(path), timeout)
|
||||
}
|
||||
|
||||
fn runs(dir: &Path) -> usize {
|
||||
std::fs::read_to_string(dir.join("runs")).map_or(0, |s| s.lines().count())
|
||||
}
|
||||
|
||||
fn wait_for(what: &str, done: impl Fn() -> bool) {
|
||||
let deadline = Instant::now() + Duration::from_secs(10);
|
||||
while !done() {
|
||||
assert!(Instant::now() < deadline, "timed out waiting for {what}");
|
||||
std::thread::sleep(Duration::from_millis(10));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_running_server_is_shared_and_stop_ends_it() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let script = format!("echo \"$*\" > args\necho $$ > pid\n{STARTED}\nexec sleep 30");
|
||||
let devtools = server(dir.path(), &script, Duration::from_secs(10));
|
||||
assert_eq!(devtools.url().unwrap(), "http://127.0.0.1:4242");
|
||||
assert_eq!(devtools.url().unwrap(), "http://127.0.0.1:4242");
|
||||
assert_eq!(runs(dir.path()), 1);
|
||||
let args = std::fs::read_to_string(dir.path().join("args")).unwrap();
|
||||
assert_eq!(args.trim(), ARGS.join(" "));
|
||||
|
||||
let pid = std::fs::read_to_string(dir.path().join("pid")).unwrap();
|
||||
devtools.stop();
|
||||
let alive = || {
|
||||
let mut probe = std::process::Command::new("kill");
|
||||
probe.args(["-0", pid.trim()]).stderr(std::process::Stdio::null()).status().unwrap().success()
|
||||
};
|
||||
wait_for("the server to end", || !alive());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_failure_is_reported_and_only_a_new_request_retries() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let devtools = server(dir.path(), "echo boom >&2\nexit 3", Duration::from_secs(10));
|
||||
assert_eq!(devtools.url().unwrap_err(), "boom");
|
||||
std::thread::sleep(Duration::from_millis(100));
|
||||
assert_eq!(runs(dir.path()), 1);
|
||||
assert_eq!(devtools.url().unwrap_err(), "boom");
|
||||
assert_eq!(runs(dir.path()), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_server_that_exits_is_not_restarted_until_asked() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let devtools = server(dir.path(), STARTED, Duration::from_secs(10));
|
||||
devtools.url().unwrap();
|
||||
wait_for("the exit to be noticed", || matches!(devtools.0.state.lock().status, Status::Stopped));
|
||||
assert_eq!(runs(dir.path()), 1);
|
||||
devtools.url().unwrap();
|
||||
assert_eq!(runs(dir.path()), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_server_that_never_reports_times_out() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let devtools = server(dir.path(), "exec sleep 30", Duration::from_millis(200));
|
||||
assert_eq!(devtools.url().unwrap_err(), "Flutter DevTools did not start in time");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,10 @@
|
||||
//! a watcher in its process group ends the group once the IDE is gone, even after a crash. A
|
||||
//! daemon that fails stays failed until the user restarts it.
|
||||
|
||||
mod devtools;
|
||||
|
||||
pub use devtools::DevToolsServer;
|
||||
|
||||
use ide_android::AndroidDevice;
|
||||
use ide_core::event::{FlutterDaemonStatus, FlutterDevice, FlutterDeviceList};
|
||||
use ide_core::process::{kill_tree, own_group, prepare, terminate_tree};
|
||||
@@ -227,26 +231,28 @@ fn refresh_adb(shared: &Arc<Shared>, generation: u64) {
|
||||
});
|
||||
}
|
||||
|
||||
/// `flutter daemon`, ended with its whole process group when process `parent` is gone.
|
||||
/// A tool that does not end with its stdin, ended with its whole process group when process
|
||||
/// `parent` is gone.
|
||||
#[cfg(unix)]
|
||||
fn daemon_command(executable: &Path, parent: u32) -> Command {
|
||||
fn watched_command(executable: &Path, args: &[&str], parent: u32) -> Command {
|
||||
const WATCHED: &str = r#"(while kill -0 "$1" 2>/dev/null; do sleep 5; done; kill -KILL 0) </dev/null >/dev/null 2>&1 &
|
||||
exec "$2" daemon"#;
|
||||
shift
|
||||
exec "$@""#;
|
||||
let mut cmd = Command::new("/bin/sh");
|
||||
cmd.args(["-c", WATCHED, "sh"]).arg(parent.to_string()).arg(executable);
|
||||
cmd.args(["-c", WATCHED, "sh"]).arg(parent.to_string()).arg(executable).args(args);
|
||||
cmd
|
||||
}
|
||||
|
||||
// No watcher on Windows, so a crashed IDE leaves the daemon; a Job Object would cover it.
|
||||
// No watcher on Windows, so a crashed IDE leaves the tool; a Job Object would cover it.
|
||||
#[cfg(not(unix))]
|
||||
fn daemon_command(executable: &Path, _parent: u32) -> Command {
|
||||
fn watched_command(executable: &Path, args: &[&str], _parent: u32) -> Command {
|
||||
let mut cmd = Command::new(executable);
|
||||
cmd.arg("daemon");
|
||||
cmd.args(args);
|
||||
cmd
|
||||
}
|
||||
|
||||
fn spawn_daemon(executable: &Path, root: &Path) -> std::io::Result<Child> {
|
||||
let mut cmd = daemon_command(executable, std::process::id());
|
||||
fn spawn_watched(executable: &Path, args: &[&str], root: &Path) -> std::io::Result<Child> {
|
||||
let mut cmd = watched_command(executable, args, std::process::id());
|
||||
cmd.current_dir(root).stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped());
|
||||
prepare(own_group(&mut cmd));
|
||||
cmd.spawn()
|
||||
@@ -299,7 +305,7 @@ fn run(shared: &Arc<Shared>, generation: u64) {
|
||||
let Some(executable) = executable else {
|
||||
return finish(shared, generation, FlutterDaemonStatus::NotInstalled);
|
||||
};
|
||||
let mut child = match spawn_daemon(&executable, &shared.root) {
|
||||
let mut child = match spawn_watched(&executable, &["daemon"], &shared.root) {
|
||||
Ok(child) => child,
|
||||
Err(e) => {
|
||||
let message = format!("could not run {}: {e}", executable.display());
|
||||
@@ -530,7 +536,7 @@ cat > /dev/null
|
||||
std::fs::write(&flutter, "#!/bin/sh\necho $$ > pid\nexec sleep 60\n").unwrap();
|
||||
std::fs::set_permissions(&flutter, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||
let mut ide = Command::new("sleep").arg("60").spawn().unwrap();
|
||||
let mut cmd = daemon_command(&flutter, ide.id());
|
||||
let mut cmd = watched_command(&flutter, &["daemon"], ide.id());
|
||||
cmd.current_dir(dir.path()).stdin(Stdio::piped());
|
||||
let mut daemon = own_group(&mut cmd).spawn().unwrap();
|
||||
wait_for("the daemon", || dir.path().join("pid").is_file());
|
||||
|
||||
@@ -344,6 +344,7 @@ impl Host {
|
||||
project.documents.clear_workspace_edit_history();
|
||||
project.agents.shutdown();
|
||||
project.flutter.stop();
|
||||
project.devtools.stop();
|
||||
project.notebooks.stop_admission();
|
||||
// What the closing window started goes with it — the builds and searches it
|
||||
// asked for, its runs, its shells and its debug sessions — and its language
|
||||
@@ -464,6 +465,7 @@ impl Host {
|
||||
self.terminals.kill_all();
|
||||
for project in self.projects() {
|
||||
project.flutter.kill();
|
||||
project.devtools.kill();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -487,6 +489,7 @@ impl Host {
|
||||
for project in &projects {
|
||||
project.files_events_active.store(false, std::sync::atomic::Ordering::Release);
|
||||
project.flutter.kill();
|
||||
project.devtools.kill();
|
||||
}
|
||||
for project in &projects {
|
||||
project.plugin_diagnostics.close();
|
||||
|
||||
@@ -245,6 +245,7 @@ pub async fn build_sync(
|
||||
return Err(IdeError::not_found("Build project is no longer linked"));
|
||||
}
|
||||
let mut profiles_changed = false;
|
||||
let mut offline_changed = false;
|
||||
for scope in selected {
|
||||
if token.is_cancelled() {
|
||||
return Err(IdeError::cancelled());
|
||||
@@ -260,6 +261,10 @@ pub async fn build_sync(
|
||||
p.sink.emit(IdeEvent::ProjectRootsChanged { root: p.root.clone().into() });
|
||||
}
|
||||
profiles_changed |= changed;
|
||||
offline_changed |= ide_build::save_maven_offline(cache, offline).unwrap_or_else(|e| {
|
||||
tracing::warn!("Maven offline mode not saved: {e}");
|
||||
false
|
||||
});
|
||||
}
|
||||
let env = current
|
||||
.maven
|
||||
@@ -306,12 +311,12 @@ pub async fn build_sync(
|
||||
let scopes = workspace::scopes(&p, &config)?;
|
||||
let model = workspace::load_scopes(&p.root, &scopes);
|
||||
let updates = workspace::update_files(&p.root, &scopes, &model, tool);
|
||||
Ok::<_, IdeError>((model, profiles_changed, updates))
|
||||
Ok::<_, IdeError>((model, profiles_changed, offline_changed, updates))
|
||||
})
|
||||
.await
|
||||
.map_err(join_err);
|
||||
host.end_request(request);
|
||||
let (model, profiles_changed, updates) = result??;
|
||||
let (model, profiles_changed, offline_changed, updates) = result??;
|
||||
if completion_token.is_cancelled() {
|
||||
return Err(IdeError::cancelled());
|
||||
}
|
||||
@@ -336,8 +341,8 @@ pub async fn build_sync(
|
||||
let lsp = project.lsp.clone();
|
||||
let documents = project.documents.clone();
|
||||
tokio::spawn(async move {
|
||||
if profiles_changed {
|
||||
// jdtls takes the profiles from its Maven settings (see `ide_sdk::maven_profiles`).
|
||||
if profiles_changed || offline_changed {
|
||||
// jdtls takes the profiles and offline mode from its Maven settings (see `ide_sdk::maven_profiles`).
|
||||
lsp.reconfigure().await;
|
||||
}
|
||||
let first = updates.first().cloned();
|
||||
|
||||
@@ -127,6 +127,13 @@ pub async fn doc_outline(host: &Host, window: &str, doc: DocId) -> IdeResult<Vec
|
||||
.await
|
||||
}
|
||||
|
||||
/// Structure view of a Flutter file: its declarations with the widgets they build. `None`
|
||||
/// when the Dart server published no widgets for it; `doc_outline` then applies.
|
||||
#[command(trust = always)]
|
||||
pub async fn doc_flutter_outline(host: &Host, window: &str, doc: DocId) -> IdeResult<Option<Vec<OutlineItem>>> {
|
||||
Ok(host.project(window)?.lsp.flutter_outline(doc))
|
||||
}
|
||||
|
||||
#[command(trust = always)]
|
||||
pub async fn doc_folding(host: &Host, window: &str, doc: DocId) -> IdeResult<Vec<FoldRange>> {
|
||||
let project = host.project(window)?;
|
||||
@@ -227,6 +234,7 @@ pub async fn history_content(host: &Host, window: &str, id: String) -> IdeResult
|
||||
|
||||
ide_command::domain!(
|
||||
doc_commands:
|
||||
doc_flutter_outline,
|
||||
doc_folding,
|
||||
doc_highlights,
|
||||
doc_language,
|
||||
|
||||
@@ -6,14 +6,13 @@ use ide_core::{IdeError, IdeResult};
|
||||
use ide_docker::DockerEndpoint;
|
||||
use ide_ssh::Tunnel;
|
||||
use std::collections::{BTreeMap, HashMap};
|
||||
use std::sync::Arc;
|
||||
|
||||
/// What each tunnelled connection runs on the SSH host, as the Docker CLI's `ssh://` does.
|
||||
const DIAL: &str = "docker system dial-stdio";
|
||||
|
||||
/// Open tunnels of [`DockerEndpoint::Ssh`] connections, by SSH configuration id.
|
||||
#[derive(Default)]
|
||||
pub struct DockerTunnels(tokio::sync::Mutex<HashMap<String, Arc<Tunnel>>>);
|
||||
pub struct DockerTunnels(tokio::sync::Mutex<HashMap<String, Tunnel>>);
|
||||
|
||||
/// `endpoint` as docker can use it: an SSH configuration becomes the local end of a tunnel to its
|
||||
/// host's daemon (opened on first use, reopened when the SSH connection dropped).
|
||||
@@ -21,8 +20,8 @@ pub async fn resolve(host: &Host, endpoint: DockerEndpoint) -> IdeResult<DockerE
|
||||
let DockerEndpoint::Ssh { config } = endpoint else { return Ok(endpoint) };
|
||||
let id = config.trim().to_owned();
|
||||
let mut tunnels = host.docker_tunnels.0.lock().await;
|
||||
let tunnel = match tunnels.get(&id).filter(|t| !t.is_closed()) {
|
||||
Some(t) => t.clone(),
|
||||
let port = match tunnels.get(&id).filter(|t| !t.is_closed()) {
|
||||
Some(t) => t.port(),
|
||||
None => {
|
||||
let session = host.ssh.session(&id).await?;
|
||||
// Fail with the reason here: a missing docker only shows as a dropped connection later.
|
||||
@@ -35,12 +34,24 @@ pub async fn resolve(host: &Host, endpoint: DockerEndpoint) -> IdeResult<DockerE
|
||||
if why.is_empty() { String::new() } else { format!(": {why}") }
|
||||
)));
|
||||
}
|
||||
let t = Arc::new(Tunnel::command(session, DIAL).await?);
|
||||
tunnels.insert(id, t.clone());
|
||||
t
|
||||
let t = Tunnel::command(session, DIAL).await?;
|
||||
let port = t.port();
|
||||
tunnels.insert(id, t);
|
||||
port
|
||||
}
|
||||
};
|
||||
Ok(DockerEndpoint::Tcp { host: format!("tcp://127.0.0.1:{}", tunnel.port()), tls_cert_dir: None })
|
||||
Ok(DockerEndpoint::Tcp { host: format!("tcp://127.0.0.1:{port}"), tls_cert_dir: None })
|
||||
}
|
||||
|
||||
/// Closes what [`resolve`] opened for `endpoint`: an SSH configuration's tunnel, and then its SSH
|
||||
/// connection unless something else (a terminal, a transfer) holds it. The next [`resolve`] opens
|
||||
/// them again; other endpoints keep nothing open.
|
||||
pub async fn disconnect(host: &Host, endpoint: &DockerEndpoint) {
|
||||
let DockerEndpoint::Ssh { config } = endpoint else { return };
|
||||
let id = config.trim();
|
||||
let Some(tunnel) = host.docker_tunnels.0.lock().await.remove(id) else { return };
|
||||
tunnel.close().await;
|
||||
host.ssh.release(id);
|
||||
}
|
||||
|
||||
/// Environment for a Docker run configuration's command line: selects `endpoint`'s
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
//! adapter run too, so a remote project lists the devices of its remote machine.
|
||||
use crate::Host;
|
||||
use ide_command::command;
|
||||
use ide_core::IdeResult;
|
||||
use ide_core::event::FlutterDeviceList;
|
||||
use ide_core::{IdeError, IdeResult};
|
||||
|
||||
/// The project's Flutter devices, starting its `flutter daemon` on first use. Changes arrive as
|
||||
/// `IdeEvent::FlutterDevices`.
|
||||
@@ -25,4 +25,15 @@ pub fn flutter_daemon_restart(host: &Host, window: &str) -> IdeResult<FlutterDev
|
||||
Ok(host.project(window)?.flutter.restart())
|
||||
}
|
||||
|
||||
ide_command::domain!(flutter: flutter_devices, flutter_devices_refresh, flutter_daemon_restart);
|
||||
/// The address of the project's DevTools server, started on first use. A server that failed or
|
||||
/// exited is only started again by the next request.
|
||||
#[command(trust = trusted)]
|
||||
pub async fn flutter_devtools_url(host: &Host, window: &str) -> IdeResult<String> {
|
||||
let project = host.project(window)?;
|
||||
tokio::task::spawn_blocking(move || project.devtools.url())
|
||||
.await
|
||||
.map_err(|e| IdeError::internal(e.to_string()))?
|
||||
.map_err(IdeError::unavailable)
|
||||
}
|
||||
|
||||
ide_command::domain!(flutter: flutter_devices, flutter_devices_refresh, flutter_daemon_restart, flutter_devtools_url);
|
||||
@@ -26,12 +26,6 @@ pub(super) fn prepare_debug(config: &mut LaunchConfig, paths: &[PathBuf]) -> Ide
|
||||
if extra.as_ref().is_some_and(|e| e.get("debugServer").is_some()) {
|
||||
return Ok(());
|
||||
}
|
||||
if cfg!(windows)
|
||||
&& let Some(extra) = extra.as_mut()
|
||||
{
|
||||
start_in_internal_console(extra);
|
||||
config.extra_json = Some(extra.to_string());
|
||||
}
|
||||
if let Some(env) = extra.as_mut().and_then(|e| e.get_mut("env")) {
|
||||
if env.is_null() {
|
||||
*env = serde_json::json!({});
|
||||
@@ -52,29 +46,10 @@ pub(super) fn prepare_debug(config: &mut LaunchConfig, paths: &[PathBuf]) -> Ide
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// On Windows debugpy's launcher never connects when it runs on the pseudo-terminal of
|
||||
/// `runInTerminal` (ConPTY), and the launch times out; started by debugpy itself it does. The
|
||||
/// program then can't read typed input, but it can be debugged.
|
||||
fn start_in_internal_console(extra: &mut serde_json::Value) {
|
||||
if extra.get("console").and_then(|c| c.as_str()) == Some("integratedTerminal") {
|
||||
extra["console"] = serde_json::json!("internalConsole");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn windows_debuggees_start_in_the_internal_console() {
|
||||
let mut extra = serde_json::json!({"console": "integratedTerminal", "python": "python"});
|
||||
start_in_internal_console(&mut extra);
|
||||
assert_eq!(extra["console"], "internalConsole");
|
||||
let mut external = serde_json::json!({"console": "externalTerminal"});
|
||||
start_in_internal_console(&mut external);
|
||||
assert_eq!(external["console"], "externalTerminal");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn debug_preserves_remote_paths_and_handles_null_env() {
|
||||
let root = std::env::temp_dir().join("project");
|
||||
|
||||
@@ -17,11 +17,17 @@ fn tools(host: &Host, window: &str) -> IdeResult<Tools> {
|
||||
Ok(project) => (project.settings.effective(), project.root.clone()),
|
||||
Err(_) => (host.global_settings.effective(), Default::default()),
|
||||
};
|
||||
let custom = settings
|
||||
let mut custom: std::collections::BTreeMap<_, _> = settings
|
||||
.tools
|
||||
.iter()
|
||||
.filter_map(|(command, t)| Some((command.clone(), ide_sdk::apply::setting_path(&root, &t.path)?)))
|
||||
.collect();
|
||||
let langs = host.languages.all();
|
||||
custom.extend(ide_sdk::apply::server_command_paths(
|
||||
langs.iter().flat_map(|l| &l.language_servers),
|
||||
&root,
|
||||
&settings,
|
||||
));
|
||||
// Godot is usually an app bundle / Flatpak outside the search path.
|
||||
let found = ide_sdk::godot::find(None).map(|p| (ide_sdk::godot::COMMAND.to_owned(), p));
|
||||
let runtime = ide_sdk::apply::tool_install_environment(&root, &settings);
|
||||
|
||||
@@ -214,10 +214,6 @@ pub enum RemoteOp {
|
||||
tag: String,
|
||||
remote: String,
|
||||
},
|
||||
/// Fast-forwards local `branch` (not checked out) to its upstream.
|
||||
UpdateBranch {
|
||||
branch: String,
|
||||
},
|
||||
/// Pull dialog: `branches` of `remote` (none = the configured merge branch).
|
||||
PullFrom {
|
||||
remote: String,
|
||||
@@ -947,7 +943,6 @@ pub async fn vcs_remote(
|
||||
&cancel,
|
||||
&out,
|
||||
),
|
||||
RemoteOp::UpdateBranch { branch } => r.update_branch(&branch, &cancel, &out),
|
||||
RemoteOp::PushTag { tag, remote } => r.push_tag(&tag, &remote, &cancel, &out),
|
||||
RemoteOp::DeleteRemoteTag { tag, remote } => r.delete_remote_tag(&tag, &remote, &cancel, &out),
|
||||
RemoteOp::PullFrom { remote, branches, rebase, options } => {
|
||||
@@ -961,6 +956,32 @@ pub async fn vcs_remote(
|
||||
result
|
||||
}
|
||||
|
||||
/// Branches › Update Selected: fast-forwards local `branches` to their upstreams, one
|
||||
/// fetch per remote; the result says what happened to each. Cancellable.
|
||||
#[command(trust = trusted)]
|
||||
pub async fn vcs_update_branches(
|
||||
host: &Host,
|
||||
window: &str,
|
||||
repo: Option<PathBuf>,
|
||||
request: RequestId,
|
||||
branches: Vec<String>,
|
||||
on_output: Channel<String>,
|
||||
) -> IdeResult<Vec<BranchUpdate>> {
|
||||
host.require_trust(window)?;
|
||||
let project = host.project(window)?;
|
||||
let cancel = host.begin_request(request);
|
||||
let result = tokio::task::spawn_blocking(move || {
|
||||
let out = |line: String| {
|
||||
let _ = on_output.send(line);
|
||||
};
|
||||
project.with_repo_recorded(repo.as_deref(), Some("Git pull"), |r| r.update_branches(&branches, &cancel, &out))
|
||||
})
|
||||
.await
|
||||
.map_err(|e| ide_core::IdeError::internal(e.to_string()))?;
|
||||
host.end_request(request);
|
||||
result
|
||||
}
|
||||
|
||||
/// The user's side is `ours` (sides swapped during a rebase, as in IDEA).
|
||||
#[command(trust = always)]
|
||||
pub async fn vcs_conflict_versions(host: &Host, window: &str, path: PathBuf) -> IdeResult<ide_vcs::MergeVersions> {
|
||||
@@ -1630,6 +1651,7 @@ ide_command::domain!(
|
||||
vcs_rebase,
|
||||
vcs_rebase_with,
|
||||
vcs_remote,
|
||||
vcs_update_branches,
|
||||
vcs_remotes,
|
||||
vcs_remove_worktree,
|
||||
vcs_rename_branch,
|
||||
|
||||
@@ -63,6 +63,8 @@ pub struct Project {
|
||||
pub notebooks: Arc<crate::notebook::NotebookService>,
|
||||
/// Flutter's devices; its daemon starts when the UI first asks for them.
|
||||
pub(crate) flutter: ide_flutter::FlutterDaemon,
|
||||
/// Flutter DevTools; its server starts when the UI first asks for it.
|
||||
pub(crate) devtools: ide_flutter::DevToolsServer,
|
||||
pub(crate) kotlin_bridge: Option<Arc<crate::kotlin_bridge::KotlinBridge>>,
|
||||
pub(crate) phpstan: Option<Arc<crate::phpstan::Phpstan>>,
|
||||
pub(crate) watcher: Arc<Watcher>,
|
||||
@@ -202,6 +204,7 @@ impl Host {
|
||||
};
|
||||
let profiles = ide_build::maven_profiles(&cache);
|
||||
ide_sdk::maven_profiles::configure_jdtls(cfg, root, &effective, &profiles, &cache);
|
||||
ide_sdk::maven_profiles::configure_offline(cfg, ide_build::maven_offline(&cache));
|
||||
}
|
||||
ide_sdk::java::cap_java_home(cfg, &ide_sdk::java::installed_jdks());
|
||||
if cfg.name == "jdtls" {
|
||||
@@ -604,6 +607,7 @@ impl Host {
|
||||
plugin_diagnostics,
|
||||
trusted,
|
||||
flutter: ide_flutter::FlutterDaemon::new(root.clone(), sink.clone()),
|
||||
devtools: ide_flutter::DevToolsServer::new(root.clone()),
|
||||
root,
|
||||
sink,
|
||||
languages,
|
||||
@@ -817,6 +821,7 @@ impl Host {
|
||||
plugin_diagnostics,
|
||||
trusted: Arc::new(AtomicBool::new(false)),
|
||||
flutter: ide_flutter::FlutterDaemon::new(dir.clone(), sink.clone()),
|
||||
devtools: ide_flutter::DevToolsServer::new(dir.clone()),
|
||||
sink,
|
||||
languages,
|
||||
settings,
|
||||
|
||||
@@ -283,6 +283,7 @@ impl crate::Host {
|
||||
self.environment.direnv_closed(&project.root);
|
||||
project.agents.shutdown();
|
||||
project.flutter.stop();
|
||||
project.devtools.stop();
|
||||
self.processes.kill_project(&project.root);
|
||||
project.notebooks.restrict().await;
|
||||
let windows: Vec<_> = self
|
||||
|
||||
@@ -471,7 +471,8 @@ async fn run_target_validation_gates_launches_and_preserves_selection() {
|
||||
f._tmp.path().join("plugins"),
|
||||
Arc::new(|_: Option<&str>, _| {}),
|
||||
Limits {
|
||||
timeout: Duration::from_millis(200),
|
||||
// Room for a reclaimed instance to start again on a slow runner.
|
||||
timeout: Duration::from_millis(750),
|
||||
idle_timeout: Some(Duration::from_millis(20)),
|
||||
restart_backoff: Duration::ZERO,
|
||||
..Default::default()
|
||||
|
||||
@@ -1560,7 +1560,11 @@ fn edit_path_calls_have_soft_and_hard_deadlines() {
|
||||
// Past the hard deadline: interrupted; the next call gets a new instance.
|
||||
assert!(provider.highlights(&mis, "spin").is_none());
|
||||
std::thread::sleep(Duration::from_millis(450));
|
||||
host.tick();
|
||||
// A slow runner may interrupt the spinning call a little after its deadline.
|
||||
assert!(eventually(|| {
|
||||
host.tick();
|
||||
host.info_of("misbehave").unwrap().stats.crashes > 0
|
||||
}));
|
||||
let info = host.info_of("misbehave").unwrap();
|
||||
assert_eq!(info.stats.crashes, 1, "{:?}", info.error);
|
||||
assert!(info.error.as_deref().is_some_and(|e| e.contains("timed out after 400ms")), "{:?}", info.error);
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
use ide_core::remote_settings::{SshAuth, SshConfiguration};
|
||||
use ide_core::{IdeEvent, SharedSink};
|
||||
use ide_docker::DockerEndpoint;
|
||||
use ide_host::ops::docker;
|
||||
use ide_host::{Host, HostConfig};
|
||||
use ide_ssh::{SshFiles, SshManager};
|
||||
use std::path::Path;
|
||||
use std::sync::{Arc, Mutex, mpsc};
|
||||
use std::time::Duration;
|
||||
|
||||
@@ -16,14 +19,12 @@ fn read_until(rx: &mpsc::Receiver<String>, needle: &str) -> String {
|
||||
all
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn ssh_session_opens_a_shell_with_the_saved_password() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let port =
|
||||
ide_ssh::testing::sshd(tmp.path().join("server"), Arc::new(|cmd| panic!("unexpected exec: {cmd}"))).await;
|
||||
/// A host whose SSH configuration `box` reaches an in-process server answering `exec`.
|
||||
async fn host_with_ssh_box(tmp: &Path, exec: ide_ssh::testing::ExecFn) -> (Arc<Host>, mpsc::Receiver<IdeEvent>) {
|
||||
let port = ide_ssh::testing::sshd(tmp.join("server"), exec).await;
|
||||
let ssh = Arc::new(SshManager::with_files(
|
||||
tmp.path().join("secrets.json"),
|
||||
SshFiles { known_hosts: tmp.path().join("known_hosts"), config: None },
|
||||
tmp.join("secrets.json"),
|
||||
SshFiles { known_hosts: tmp.join("known_hosts"), config: None },
|
||||
));
|
||||
ssh.set_configs(vec![SshConfiguration {
|
||||
id: "box".into(),
|
||||
@@ -44,7 +45,7 @@ async fn ssh_session_opens_a_shell_with_the_saved_password() {
|
||||
let sink: SharedSink = Arc::new(move |e: IdeEvent| {
|
||||
let _ = events_tx.lock().unwrap().send(e);
|
||||
});
|
||||
let base = tmp.path().join("app");
|
||||
let base = tmp.join("app");
|
||||
let mut host = Arc::new(Host::new(HostConfig {
|
||||
config_dir: base.join("config"),
|
||||
data_dir: base.join("data"),
|
||||
@@ -58,6 +59,14 @@ async fn ssh_session_opens_a_shell_with_the_saved_password() {
|
||||
}));
|
||||
Arc::get_mut(&mut host).unwrap().ssh = ssh;
|
||||
|
||||
(host, events)
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn ssh_session_opens_a_shell_with_the_saved_password() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let (host, events) = host_with_ssh_box(tmp.path(), Arc::new(|cmd| panic!("unexpected exec: {cmd}"))).await;
|
||||
|
||||
let (tx, output) = mpsc::channel();
|
||||
let tx = Mutex::new(tx);
|
||||
let info = ide_host::ops::term::spawn_ssh(
|
||||
@@ -100,3 +109,55 @@ async fn ssh_session_opens_a_shell_with_the_saved_password() {
|
||||
assert_eq!(code, None);
|
||||
host.shutdown().await;
|
||||
}
|
||||
|
||||
/// Reads what a connection to the local end of a Docker tunnel gets back.
|
||||
async fn dial(port: u16) -> std::io::Result<String> {
|
||||
use tokio::io::AsyncReadExt;
|
||||
let mut socket = tokio::net::TcpStream::connect(("127.0.0.1", port)).await?;
|
||||
let mut out = String::new();
|
||||
socket.read_to_string(&mut out).await?;
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn tunnel_port(endpoint: &DockerEndpoint) -> u16 {
|
||||
let DockerEndpoint::Tcp { host, .. } = endpoint else { panic!("not a tunnel: {endpoint:?}") };
|
||||
host.rsplit(':').next().unwrap().parse().unwrap()
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn disconnecting_a_docker_connection_closes_its_tunnel_and_unused_ssh_session() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let (host, _events) = host_with_ssh_box(
|
||||
tmp.path(),
|
||||
Arc::new(|cmd| match cmd {
|
||||
"docker version --format {{.Client.Version}}" => ("27.0.3\n".into(), 0),
|
||||
"docker system dial-stdio" => ("daemon".into(), 0),
|
||||
other => panic!("unexpected exec: {other}"),
|
||||
}),
|
||||
)
|
||||
.await;
|
||||
let ssh = DockerEndpoint::Ssh { config: "box".into() };
|
||||
|
||||
let port = tunnel_port(&docker::resolve(&host, ssh.clone()).await.unwrap());
|
||||
assert_eq!(dial(port).await.unwrap(), "daemon");
|
||||
assert_eq!(host.ssh.connected(), ["box"]);
|
||||
|
||||
docker::disconnect(&host, &ssh).await;
|
||||
assert!(dial(port).await.is_err(), "the tunnel stopped listening");
|
||||
assert!(host.ssh.connected().is_empty(), "nothing else used the SSH connection");
|
||||
|
||||
// Connecting again opens a new tunnel; a terminal on the same host keeps the session open.
|
||||
let port = tunnel_port(&docker::resolve(&host, ssh.clone()).await.unwrap());
|
||||
assert_eq!(dial(port).await.unwrap(), "daemon");
|
||||
let terminal = host.ssh.session("box").await.unwrap();
|
||||
docker::disconnect(&host, &ssh).await;
|
||||
assert!(dial(port).await.is_err());
|
||||
assert_eq!(host.ssh.connected(), ["box"]);
|
||||
assert!(!terminal.is_closed());
|
||||
|
||||
// Nothing to close: a second disconnect and other endpoints are no-ops.
|
||||
docker::disconnect(&host, &ssh).await;
|
||||
docker::disconnect(&host, &DockerEndpoint::Default).await;
|
||||
assert_eq!(host.ssh.connected(), ["box"]);
|
||||
host.shutdown().await;
|
||||
}
|
||||
@@ -690,7 +690,7 @@ mod tests {
|
||||
for (lang, servers) in [
|
||||
("python", vec!["basedpyright", "pyright", "ty", "pyrefly"]),
|
||||
("typescript", vec!["vtsls", "typescript-language-server"]),
|
||||
("java", vec!["jdtls", "kmp-lsp"]),
|
||||
("java", vec!["jdtls", "java-analyzer", "kmp-lsp"]),
|
||||
("kotlin", vec!["kotlin-lsp", "kotlin-language-server", "kmp-lsp"]),
|
||||
] {
|
||||
let cfg = reg.get(&LanguageId::new(lang)).unwrap();
|
||||
|
||||
@@ -0,0 +1,196 @@
|
||||
//! The Dart analysis server's Flutter outline (`dart/textDocument/publishFlutterOutline`):
|
||||
//! a file's declarations with the widgets built inside them, in source order.
|
||||
|
||||
use crate::convert::Conv;
|
||||
use ide_core::{OutlineItem, SymbolKind};
|
||||
use lsp_types as lsp;
|
||||
use serde::Deserialize;
|
||||
use std::path::Path;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub(crate) struct Params {
|
||||
pub uri: String,
|
||||
pub outline: Node,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub(crate) struct Node {
|
||||
kind: String,
|
||||
label: Option<String>,
|
||||
class_name: Option<String>,
|
||||
variable_name: Option<String>,
|
||||
attributes: Option<Vec<Attribute>>,
|
||||
dart_element: Option<Element>,
|
||||
range: lsp::Range,
|
||||
children: Option<Vec<Node>>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct Attribute {
|
||||
name: String,
|
||||
label: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct Element {
|
||||
name: String,
|
||||
kind: String,
|
||||
range: Option<lsp::Range>,
|
||||
parameters: Option<String>,
|
||||
type_parameters: Option<String>,
|
||||
return_type: Option<String>,
|
||||
}
|
||||
|
||||
/// The items below the compilation unit; `None` when no widget is built in the file, whose
|
||||
/// structure is then the ordinary one.
|
||||
pub(crate) fn items(conv: &Conv, path: &Path, root: Node) -> Option<Vec<OutlineItem>> {
|
||||
let children = root.children?;
|
||||
children.iter().any(has_widget).then(|| children.into_iter().map(|n| item(conv, path, n)).collect())
|
||||
}
|
||||
|
||||
fn has_widget(node: &Node) -> bool {
|
||||
node.dart_element.is_none() || node.children.iter().flatten().any(has_widget)
|
||||
}
|
||||
|
||||
fn item(conv: &Conv, path: &Path, node: Node) -> OutlineItem {
|
||||
let range = conv.range(path, node.range);
|
||||
let detail = widget_detail(&node);
|
||||
let children = node.children.unwrap_or_default().into_iter().map(|n| item(conv, path, n)).collect();
|
||||
let (name, detail, kind, selection_range) = match node.dart_element {
|
||||
Some(e) => (
|
||||
format!("{}{}{}", e.name, e.type_parameters.unwrap_or_default(), e.parameters.unwrap_or_default()),
|
||||
e.return_type.filter(|t| !t.is_empty()).map(|t| format!("→ {t}")),
|
||||
element_kind(&e.kind),
|
||||
e.range.map_or(range, |r| conv.range(path, r)),
|
||||
),
|
||||
None => (node.class_name.or(node.label).unwrap_or(node.kind), detail, SymbolKind::Widget, range),
|
||||
};
|
||||
OutlineItem { name, detail, kind, range, selection_range, children, visibility: None }
|
||||
}
|
||||
|
||||
/// What follows a widget's class, as the Flutter plugin's outline shows it: the variable holding
|
||||
/// it, a generic node's expression, then its attributes (`Text 'Hi'`, `Icon icon: add, size: 24`).
|
||||
fn widget_detail(node: &Node) -> Option<String> {
|
||||
let mut parts: Vec<String> = node.variable_name.iter().cloned().collect();
|
||||
if node.kind == "GENERIC" {
|
||||
parts.extend(node.label.iter().cloned());
|
||||
}
|
||||
match node.attributes.as_deref().unwrap_or_default() {
|
||||
[only] if matches!(only.name.as_str(), "text" | "icon") => parts.push(only.label.clone()),
|
||||
attributes if !attributes.is_empty() => parts.push(
|
||||
attributes
|
||||
.iter()
|
||||
.map(|a| if a.name == "data" { a.label.clone() } else { format!("{}: {}", a.name, a.label) })
|
||||
.collect::<Vec<_>>()
|
||||
.join(", "),
|
||||
),
|
||||
_ => {}
|
||||
}
|
||||
(!parts.is_empty()).then(|| parts.join(" "))
|
||||
}
|
||||
|
||||
fn element_kind(kind: &str) -> SymbolKind {
|
||||
match kind {
|
||||
"CLASS" | "CLASS_TYPE_ALIAS" | "EXTENSION" | "EXTENSION_TYPE" => SymbolKind::Class,
|
||||
"MIXIN" => SymbolKind::Interface,
|
||||
"ENUM" => SymbolKind::Enum,
|
||||
"ENUM_CONSTANT" => SymbolKind::EnumMember,
|
||||
"CONSTRUCTOR" => SymbolKind::Constructor,
|
||||
"METHOD" => SymbolKind::Method,
|
||||
"FUNCTION" => SymbolKind::Function,
|
||||
"FIELD" => SymbolKind::Field,
|
||||
"GETTER" | "SETTER" => SymbolKind::Property,
|
||||
"TOP_LEVEL_VARIABLE" => SymbolKind::Variable,
|
||||
"FUNCTION_TYPE_ALIAS" | "TYPE_ALIAS" => SymbolKind::TypeAlias,
|
||||
_ => SymbolKind::Unknown,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::text::{DocText, Encoding};
|
||||
use ide_core::{Pos, Range};
|
||||
use serde_json::{Value, json};
|
||||
use std::sync::Arc;
|
||||
|
||||
fn range(line: u32, from: u32, to: u32) -> Value {
|
||||
json!({ "start": { "line": line, "character": from }, "end": { "line": line, "character": to } })
|
||||
}
|
||||
|
||||
fn element(kind: &str, name: &str, extra: Value, children: Value) -> Value {
|
||||
let mut e = json!({ "kind": kind, "name": name, "range": range(1, 9, 14) });
|
||||
e.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone());
|
||||
json!({ "kind": "DART_ELEMENT", "dartElement": e, "range": range(0, 0, 40), "codeRange": range(0, 0, 40), "children": children })
|
||||
}
|
||||
|
||||
fn widget(kind: &str, class: &str, extra: Value) -> Value {
|
||||
let mut w = json!({ "kind": kind, "className": class, "range": range(3, 4, 12), "codeRange": range(3, 4, 12) });
|
||||
w.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone());
|
||||
w
|
||||
}
|
||||
|
||||
fn convert(conv: &Conv, children: Value) -> Option<Vec<OutlineItem>> {
|
||||
let root: Node = serde_json::from_value(element("COMPILATION_UNIT", "<unit>", json!({}), children)).unwrap();
|
||||
items(conv, Path::new("/p/a.dart"), root)
|
||||
}
|
||||
|
||||
fn utf16() -> Conv<'static> {
|
||||
Conv::new(Encoding::Utf16, |_: &Path| None)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn declarations_keep_their_widgets_in_source_order() {
|
||||
let outline = json!([element(
|
||||
"METHOD",
|
||||
"build",
|
||||
json!({ "parameters": "(BuildContext context)", "returnType": "Widget" }),
|
||||
json!([widget("NEW_INSTANCE", "Scaffold", json!({})), widget("NEW_INSTANCE", "Align", json!({}))]),
|
||||
)]);
|
||||
let items = convert(&utf16(), outline).unwrap();
|
||||
let build = &items[0];
|
||||
assert_eq!(build.name, "build(BuildContext context)");
|
||||
assert_eq!(build.detail.as_deref(), Some("→ Widget"));
|
||||
assert_eq!(build.kind, SymbolKind::Method);
|
||||
assert_eq!(build.selection_range, Range::new(Pos::new(1, 9), Pos::new(1, 14)));
|
||||
let names: Vec<_> = build.children.iter().map(|c| c.name.as_str()).collect();
|
||||
assert_eq!(names, ["Scaffold", "Align"]);
|
||||
assert_eq!(build.children[0].kind, SymbolKind::Widget);
|
||||
assert_eq!(build.children[0].selection_range, build.children[0].range);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn widget_details_read_like_the_flutter_plugin() {
|
||||
let attr = |name: &str, label: &str| json!({ "name": name, "label": label });
|
||||
let detail = |w: Value| convert(&utf16(), json!([w])).unwrap().remove(0).detail;
|
||||
let w = widget("NEW_INSTANCE", "Text", json!({ "attributes": [attr("data", "'Hi'")] }));
|
||||
assert_eq!(detail(w).as_deref(), Some("'Hi'"));
|
||||
let w = widget("NEW_INSTANCE", "Icon", json!({ "attributes": [attr("icon", "Icons.add")] }));
|
||||
assert_eq!(detail(w).as_deref(), Some("Icons.add"));
|
||||
let w =
|
||||
widget("NEW_INSTANCE", "Icon", json!({ "attributes": [attr("icon", "Icons.add"), attr("size", "24")] }));
|
||||
assert_eq!(detail(w).as_deref(), Some("icon: Icons.add, size: 24"));
|
||||
assert_eq!(detail(widget("VARIABLE", "Text", json!({ "variableName": "title" }))).as_deref(), Some("title"));
|
||||
assert_eq!(detail(widget("GENERIC", "Widget", json!({ "label": "_footer()" }))).as_deref(), Some("_footer()"));
|
||||
assert_eq!(detail(widget("NEW_INSTANCE", "Column", json!({}))), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_file_without_widgets_has_no_flutter_outline() {
|
||||
let plain =
|
||||
json!([element("CLASS", "Plain", json!({}), json!([element("METHOD", "run", json!({}), json!([]))]))]);
|
||||
assert!(convert(&utf16(), plain).is_none());
|
||||
assert!(convert(&utf16(), json!([])).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn positions_become_utf16_columns() {
|
||||
let text = Arc::new(DocText::new("\n\n\n🙂🙂 Text('x')\n"));
|
||||
let conv = Conv::new(Encoding::Utf8, move |_: &Path| Some(text.clone()));
|
||||
let w = json!({ "kind": "NEW_INSTANCE", "className": "Text", "range": range(3, 9, 13), "codeRange": range(3, 9, 13) });
|
||||
let item = convert(&conv, json!([w])).unwrap().remove(0);
|
||||
assert_eq!(item.range, Range::new(Pos::new(3, 5), Pos::new(3, 9)));
|
||||
}
|
||||
}
|
||||
@@ -355,6 +355,24 @@ impl ClientHandler {
|
||||
mgr.emit_diagnostics(&self.server, path, shown, self.encoding());
|
||||
}
|
||||
|
||||
fn publish_flutter_outline(&self, mgr: &LspManager, params: Value) {
|
||||
let params: crate::flutter_outline::Params = match serde_json::from_value(params) {
|
||||
Ok(p) => p,
|
||||
Err(e) => {
|
||||
tracing::debug!("{}: bad publishFlutterOutline: {e}", self.server.name);
|
||||
return;
|
||||
}
|
||||
};
|
||||
let Some(path) = uri_to_path(¶ms.uri) else { return };
|
||||
if !self.server.is_live(self.generation) {
|
||||
return;
|
||||
}
|
||||
let items = crate::flutter_outline::items(&mgr.conv(self.encoding()), &path, params.outline);
|
||||
if mgr.set_flutter_outline(&path, &self.server, self.generation, items) {
|
||||
mgr.sink().emit(IdeEvent::LspRefresh { server: self.server.id, kind: LspRefreshKind::FlutterOutline });
|
||||
}
|
||||
}
|
||||
|
||||
/// Once per unresolved plugin, whether m2e marked a `pom.xml` or only logged it.
|
||||
fn build_plan_failure(&self, mgr: &LspManager, (plugin, body): (String, String)) {
|
||||
if mgr.first_message(&self.server.name, &format!("build plan: {plugin}")) {
|
||||
@@ -562,6 +580,7 @@ impl Handler for ClientHandler {
|
||||
}
|
||||
}
|
||||
"textDocument/publishDiagnostics" => self.publish_diagnostics(&mgr, params),
|
||||
"dart/textDocument/publishFlutterOutline" => self.publish_flutter_outline(&mgr, params),
|
||||
"window/showMessage" => self.show_message(&mgr, ¶ms),
|
||||
"window/logMessage" => {
|
||||
let text = params.get("message").and_then(Value::as_str).unwrap_or_default();
|
||||
|
||||
@@ -15,6 +15,7 @@ mod convert;
|
||||
mod external_project;
|
||||
mod file_ops;
|
||||
mod file_watch;
|
||||
mod flutter_outline;
|
||||
mod go_mod;
|
||||
mod go_scope;
|
||||
mod handler;
|
||||
@@ -131,6 +132,15 @@ struct DocState {
|
||||
notebook: Option<PathBuf>,
|
||||
/// When the servers last got new text (open or change): diagnostics published before are stale.
|
||||
changed: std::time::Instant,
|
||||
flutter_outline: Option<FlutterOutline>,
|
||||
}
|
||||
|
||||
/// The widget tree last published for a document, valid while that server instance runs.
|
||||
/// ponytail: positions lag edits until the server's next publish, which follows each analysis.
|
||||
struct FlutterOutline {
|
||||
server: ide_core::ServerId,
|
||||
generation: u64,
|
||||
items: Vec<OutlineItem>,
|
||||
}
|
||||
|
||||
impl DocState {
|
||||
@@ -1268,6 +1278,7 @@ impl LspManager {
|
||||
compose_detected,
|
||||
notebook: None,
|
||||
changed: std::time::Instant::now(),
|
||||
flutter_outline: None,
|
||||
};
|
||||
let compose_added = {
|
||||
let mut docs = self.docs.lock();
|
||||
@@ -2406,6 +2417,33 @@ impl LspManager {
|
||||
out.finish(None)
|
||||
}
|
||||
|
||||
/// The document's widget tree, when its running Dart server published one.
|
||||
pub fn flutter_outline(&self, doc: DocId) -> Option<Vec<OutlineItem>> {
|
||||
let docs = self.docs.lock();
|
||||
let d = docs.get(&doc)?;
|
||||
let outline = d.flutter_outline.as_ref()?;
|
||||
d.servers
|
||||
.iter()
|
||||
.any(|a| a.server.id == outline.server && a.server.is_live(outline.generation))
|
||||
.then(|| outline.items.clone())
|
||||
}
|
||||
|
||||
/// Records a published outline; whether what the open documents of `path` show changed.
|
||||
fn set_flutter_outline(
|
||||
&self,
|
||||
path: &Path,
|
||||
server: &Server,
|
||||
generation: u64,
|
||||
items: Option<Vec<OutlineItem>>,
|
||||
) -> bool {
|
||||
let mut changed = false;
|
||||
for d in self.docs.lock().values_mut().filter(|d| d.path == path) {
|
||||
changed |= d.flutter_outline.is_some() || items.is_some();
|
||||
d.flutter_outline = items.clone().map(|items| FlutterOutline { server: server.id, generation, items });
|
||||
}
|
||||
changed
|
||||
}
|
||||
|
||||
pub async fn workspace_symbols(&self, query: &str, cancel: CancellationToken) -> IdeResult<Vec<WorkspaceSymbol>> {
|
||||
let servers: Vec<Arc<Server>> = self.servers.lock().clone();
|
||||
let targets = self.ready_targets(&servers, |c| c.has("workspaceSymbolProvider")).await;
|
||||
|
||||
@@ -236,6 +236,7 @@ impl LspManager {
|
||||
compose_detected: false,
|
||||
notebook: Some(path.to_owned()),
|
||||
changed: std::time::Instant::now(),
|
||||
flutter_outline: None,
|
||||
},
|
||||
);
|
||||
state.cells.push((cell.id.clone(), doc));
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! Protocol tests against in-memory mock language servers.
|
||||
|
||||
use ide_core::event::ServerStatus;
|
||||
use ide_core::event::{LspRefreshKind, ServerStatus};
|
||||
use ide_core::{
|
||||
CancellationToken, DocId, FileEdit, IdeEvent, LanguageId, Pos, Range, ServerId, Severity, WorkspaceEdit,
|
||||
};
|
||||
@@ -1459,6 +1459,65 @@ async fn unsupported_feature_names_the_running_servers_that_lack_it() {
|
||||
assert_eq!(e.message, "plain, other doesn't support type hierarchy");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn flutter_outline_follows_the_document_and_the_server_instance() {
|
||||
let h = harness(&[("mock", incremental_caps())]);
|
||||
let (doc, path) = h.open("a.mk", "Text('x')\n");
|
||||
h.wait_status("mock", ServerStatus::Ready).await;
|
||||
let refreshes = || {
|
||||
h.events
|
||||
.lock()
|
||||
.iter()
|
||||
.filter(|e| matches!(e, IdeEvent::LspRefresh { kind: LspRefreshKind::FlutterOutline, .. }))
|
||||
.count()
|
||||
};
|
||||
let at = json!({"start":{"line":0,"character":0},"end":{"line":0,"character":9}});
|
||||
let unit = |children: Value| {
|
||||
json!({ "uri": uri_of(&path), "outline": {
|
||||
"kind": "DART_ELEMENT", "range": at, "codeRange": at,
|
||||
"dartElement": { "kind": "COMPILATION_UNIT", "name": "<unit>" },
|
||||
"children": children,
|
||||
}})
|
||||
};
|
||||
let widgets = json!([{ "kind": "NEW_INSTANCE", "className": "Text", "range": at, "codeRange": at }]);
|
||||
let peer = h.launcher.state("mock").peer();
|
||||
assert!(h.mgr.flutter_outline(doc).is_none());
|
||||
|
||||
peer.notify("dart/textDocument/publishFlutterOutline", unit(widgets.clone())).unwrap();
|
||||
eventually(|| refreshes() == 1).await;
|
||||
assert_eq!(h.mgr.flutter_outline(doc).unwrap()[0].name, "Text");
|
||||
|
||||
// The widgets are gone from the file: the ordinary structure applies again.
|
||||
peer.notify("dart/textDocument/publishFlutterOutline", unit(json!([]))).unwrap();
|
||||
eventually(|| refreshes() == 2).await;
|
||||
assert!(h.mgr.flutter_outline(doc).is_none());
|
||||
|
||||
peer.notify("dart/textDocument/publishFlutterOutline", unit(widgets.clone())).unwrap();
|
||||
eventually(|| refreshes() == 3).await;
|
||||
|
||||
// Reopening starts without the closed document's tree.
|
||||
h.mgr.did_close(doc);
|
||||
assert!(h.mgr.flutter_outline(doc).is_none());
|
||||
let (reopened, _) = h.open("a.mk", "Text('x')\n");
|
||||
assert!(h.mgr.flutter_outline(reopened).is_none());
|
||||
peer.notify("dart/textDocument/publishFlutterOutline", unit(widgets)).unwrap();
|
||||
eventually(|| refreshes() == 4).await;
|
||||
assert!(h.mgr.flutter_outline(reopened).is_some());
|
||||
|
||||
// A restarted server has analysed nothing yet.
|
||||
let server = h
|
||||
.events
|
||||
.lock()
|
||||
.iter()
|
||||
.find_map(|e| match e {
|
||||
IdeEvent::LanguageServer { server, name, .. } if name == "mock" => Some(*server),
|
||||
_ => None,
|
||||
})
|
||||
.unwrap();
|
||||
h.mgr.restart(server).await.unwrap();
|
||||
assert!(h.mgr.flutter_outline(reopened).is_none());
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn diagnostics_become_events_and_feed_code_actions() {
|
||||
let h = harness(&[("mock", incremental_caps())]);
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
//! than one place is taken from the first, in that order.
|
||||
//!
|
||||
//! Python, Django server, Django tests, pytest, npm, Jest, Vitest, Node.js, Shell Script,
|
||||
//! Application, JAR Application, Spring Boot, Go Application / Go Test and compound configurations become the
|
||||
//! Application, JAR Application, Spring Boot, Go Application / Go Test, Flutter and compound configurations become the
|
||||
//! matching kinds; other types are skipped with their type.
|
||||
//! `$PROJECT_DIR$` (and `$MODULE_DIR$`, `$MODULE_WORKING_DIR$`, `$ContentRoot$`,
|
||||
//! `$ProjectFileDir$`, all the project directory here) and `$USER_HOME$` are replaced; another
|
||||
//! path variable skips the configuration.
|
||||
|
||||
use super::{
|
||||
Entry, Found, SkipReason, command_name, config, env_var, normalize, path_from, project_python, relative_to,
|
||||
working_dir,
|
||||
Entry, Found, SkipReason, command_name, config, dart_package, env_var, flutter_run, normalize, path_from,
|
||||
project_python, relative_to, working_dir,
|
||||
};
|
||||
use crate::RunConfig;
|
||||
use ide_core::IdeResult;
|
||||
@@ -168,6 +168,7 @@ const JAR_APPLICATION: &str = "JarApplication";
|
||||
const SPRING_BOOT: &str = "SpringBootApplicationConfigurationType";
|
||||
const GO_APPLICATION: &str = "GoApplicationRunConfiguration";
|
||||
const GO_TEST: &str = "GoTestRunConfiguration";
|
||||
const FLUTTER: &str = "FlutterRunConfigurationType";
|
||||
|
||||
type Res<T> = Result<T, SkipReason>;
|
||||
|
||||
@@ -349,6 +350,7 @@ impl Cx<'_> {
|
||||
SPRING_BOOT => self.java_app(name, c, true, &mut ignored)?,
|
||||
GO_APPLICATION => self.go_config(name, c, false, &mut ignored)?,
|
||||
GO_TEST => self.go_config(name, c, true, &mut ignored)?,
|
||||
FLUTTER => self.flutter(name, c, &mut ignored)?,
|
||||
COMPOUND => {
|
||||
members = c.children_named("toRun").filter_map(|t| t.attr("name")).map(str::to_owned).collect();
|
||||
config(name, "compound", String::new(), Vec::new(), None)
|
||||
@@ -437,6 +439,32 @@ impl Cx<'_> {
|
||||
Ok(rc)
|
||||
}
|
||||
|
||||
/// The Flutter plugin's configuration (its `SdkFields`): `flutter run` in the entry's package,
|
||||
/// `additionalArgs` then `--flavor=<buildFlavor>` after the entry, as the plugin passes them.
|
||||
fn flutter(&self, name: &str, c: &El, ignored: &mut Vec<String>) -> Res<RunConfig> {
|
||||
let Some(entry) = self.path(c.option("filePath"))? else {
|
||||
return Err(SkipReason::NothingToRun);
|
||||
};
|
||||
let entry = normalize(&self.root.join(entry));
|
||||
let Some((package, _)) = dart_package(self.root, &entry) else {
|
||||
return Err(SkipReason::MissingFile { file: "pubspec.yaml".into() });
|
||||
};
|
||||
let mut extra = self.words(c.option("additionalArgs"))?;
|
||||
extra.extend(self.text(c.option("buildFlavor"))?.map(|f| format!("--flavor={f}")));
|
||||
let mut rc = flutter_run(name, self.root, &package, &entry, extra);
|
||||
// `<option name="envs"><map><entry key=… value=…/></map></option>`.
|
||||
let envs = c.children_named("option").filter(|o| o.attr("name") == Some("envs"));
|
||||
for e in envs.flat_map(|o| o.children.iter()).flat_map(|m| m.children_named("entry")) {
|
||||
if let Some(key) = e.attr("key").filter(|k| !k.is_empty()) {
|
||||
rc.env.insert(key.to_owned(), e.attr("value").unwrap_or_default().to_owned());
|
||||
}
|
||||
}
|
||||
if self.text(c.option("attachArgs"))?.is_some() {
|
||||
ignored.push("attachArgs".into());
|
||||
}
|
||||
Ok(rc)
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------- Python
|
||||
|
||||
/// The interpreter (`SDK_HOME` when the configuration doesn't use the module's), its
|
||||
|
||||
@@ -73,6 +73,8 @@ pub struct SkippedRunConfig {
|
||||
pub enum SkipReason {
|
||||
/// A configuration with this name already exists.
|
||||
NameTaken,
|
||||
/// An existing configuration (a detected one, say) runs the same command.
|
||||
SameAs { existing: String },
|
||||
/// The configuration type has no equivalent here: a VS Code debugger (`cppdbg`), a JetBrains type (`Application`).
|
||||
UnsupportedType {
|
||||
#[serde(rename = "type")]
|
||||
@@ -174,6 +176,13 @@ pub(crate) fn finish(source: RunImportSource, entries: Vec<Entry>, existing: &[R
|
||||
compounds.push((i, e.name, found));
|
||||
}
|
||||
Ok(mut found) => {
|
||||
// ponytail: only against the project's configurations; entries of one file may differ in ignored keys.
|
||||
if let Some(same) = existing.iter().find(|c| same_run(c, &found.config)) {
|
||||
// A compound naming it starts the one there is.
|
||||
by_name.insert(e.name.clone(), same.id.clone());
|
||||
skipped.push((i, skip(e.name, SkipReason::SameAs { existing: same.name.clone() })));
|
||||
continue;
|
||||
}
|
||||
found.config.id = unique_id(&e.name, &mut ids);
|
||||
by_name.insert(e.name.clone(), found.config.id.clone());
|
||||
imported.push((i, ImportedRunConfig { config: found.config, ignored: found.ignored }));
|
||||
@@ -205,8 +214,40 @@ pub(crate) fn finish(source: RunImportSource, entries: Vec<Entry>, existing: &[R
|
||||
}
|
||||
}
|
||||
|
||||
/// `a` and `b` start the same process (`flutter run -t lib/main.dart` detected and imported as `main.dart`).
|
||||
fn same_run(a: &RunConfig, b: &RunConfig) -> bool {
|
||||
a.kind == b.kind
|
||||
&& a.command == b.command
|
||||
&& a.args == b.args
|
||||
&& a.cwd == b.cwd
|
||||
&& a.is_test == b.is_test
|
||||
&& a.debug_adapter == b.debug_adapter
|
||||
&& a.env == b.env
|
||||
&& a.extras.params == b.extras.params
|
||||
&& a.extras.env_files == b.extras.env_files
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------- shared by the sources
|
||||
|
||||
/// The Dart package `file` belongs to (the closest directory with a `pubspec.yaml`, inside the
|
||||
/// project) and whether it is a Flutter app.
|
||||
pub(crate) fn dart_package(root: &Path, file: &Path) -> Option<(PathBuf, bool)> {
|
||||
let dir =
|
||||
file.ancestors().skip(1).take_while(|d| d.starts_with(root)).find(|d| d.join("pubspec.yaml").is_file())?;
|
||||
let flutter = std::fs::read_to_string(dir.join("pubspec.yaml")).is_ok_and(|p| p.contains("sdk: flutter"));
|
||||
Some((dir.to_path_buf(), flutter))
|
||||
}
|
||||
|
||||
/// `flutter run -t <entry>` in `package` (absolute), as detection writes it; `extra` after the entry.
|
||||
pub(crate) fn flutter_run(name: &str, root: &Path, package: &Path, entry: &Path, extra: Vec<String>) -> RunConfig {
|
||||
let entry = relative_to(entry, package).unwrap_or_else(|| entry.to_string_lossy().into_owned());
|
||||
let mut args = vec!["run".to_owned(), "-t".to_owned(), entry];
|
||||
args.extend(extra);
|
||||
let mut c = config(name, "flutter", "flutter".into(), args, Some("dart"));
|
||||
c.cwd = working_dir(root, &package.to_string_lossy()).1.map(Into::into);
|
||||
c
|
||||
}
|
||||
|
||||
/// The variable `name` of `env`; Windows names ignore case (`${env:PATH}` finds `Path`).
|
||||
pub(crate) fn env_var(env: &BTreeMap<String, String>, name: &str, windows: bool) -> Option<String> {
|
||||
match env.get(name) {
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
//! `${input:…}`, `${command:…}`) is skipped.
|
||||
|
||||
use super::{
|
||||
Entry, Found, SkipReason, command_name, config, env_var, normalize, path_from, project_python, split_args,
|
||||
working_dir,
|
||||
Entry, Found, SkipReason, command_name, config, dart_package, env_var, flutter_run, normalize, path_from,
|
||||
project_python, split_args, working_dir,
|
||||
};
|
||||
use crate::RunConfig;
|
||||
use ide_core::{IdeError, IdeResult};
|
||||
@@ -48,6 +48,7 @@ const NODE_LAUNCH: &[&str] = &["program", "args", "runtimeExecutable", "runtimeA
|
||||
const NODE_ATTACH: &[&str] = &["address", "port", "localRoot", "remoteRoot"];
|
||||
const NODE_TERMINAL: &[&str] = &["command"];
|
||||
const BROWSER_LAUNCH: &[&str] = &["url", "webRoot"];
|
||||
const DART_LAUNCH: &[&str] = &["program", "args", "toolArgs", "deviceId", "flutterMode"];
|
||||
const COMPOUND: &[&str] = &["configurations"];
|
||||
|
||||
const PACKAGE_MANAGERS: &[&str] = &["npm", "pnpm", "yarn", "bun"];
|
||||
@@ -226,9 +227,10 @@ impl Cx<'_> {
|
||||
("chrome" | "pwa-chrome" | "msedge" | "pwa-msedge", "launch") => {
|
||||
(self.browser_launch(name, obj, ty)?, BROWSER_LAUNCH)
|
||||
}
|
||||
("dart", "launch") => (self.dart_launch(name, obj)?, DART_LAUNCH),
|
||||
(
|
||||
"debugpy" | "python" | "node" | "pwa-node" | "node-terminal" | "chrome" | "pwa-chrome" | "msedge"
|
||||
| "pwa-msedge",
|
||||
| "pwa-msedge" | "dart",
|
||||
other,
|
||||
) => {
|
||||
return Err(SkipReason::UnsupportedRequest { request: other.to_owned() });
|
||||
@@ -236,7 +238,9 @@ impl Cx<'_> {
|
||||
(other, _) => return Err(SkipReason::UnsupportedType { type_: other.to_owned() }),
|
||||
};
|
||||
if request == "launch" {
|
||||
config.cwd = self.cwd(obj)?.1.map(Into::into);
|
||||
if config.cwd.is_none() {
|
||||
config.cwd = self.cwd(obj)?.1.map(Into::into);
|
||||
}
|
||||
self.environment(obj, &mut config)?;
|
||||
}
|
||||
let mut ignored: Vec<String> = obj
|
||||
@@ -366,6 +370,43 @@ impl Cx<'_> {
|
||||
Ok(c)
|
||||
}
|
||||
|
||||
/// Dart Code's launch: `flutter run` in a Flutter app's package, as the Flutter debug adapter
|
||||
/// starts it (`args` go to the app), else `dart run`.
|
||||
fn dart_launch(&self, name: &str, obj: &Map<String, Value>) -> Res<RunConfig> {
|
||||
let (dir, _) = self.cwd(obj)?;
|
||||
let program = self.string(obj, "program")?;
|
||||
// Relative to `cwd`, or to the workspace folder as Dart Code resolves it.
|
||||
let file = |p: &str| {
|
||||
let base = [&dir, self.root].into_iter().find(|b| b.join(p).is_file()).unwrap_or(&dir);
|
||||
normalize(&base.join(p))
|
||||
};
|
||||
let entry = file(program.as_deref().unwrap_or("lib/main.dart"));
|
||||
let tool_args = self.words(obj, "toolArgs")?;
|
||||
let args = self.words(obj, "args")?;
|
||||
match dart_package(self.root, &entry) {
|
||||
Some((package, true)) => {
|
||||
let mut extra = Vec::new();
|
||||
if let Some(device) = self.string(obj, "deviceId")? {
|
||||
extra.extend(["-d".to_owned(), device]);
|
||||
}
|
||||
if let Some(mode @ ("profile" | "release")) = self.string(obj, "flutterMode")?.as_deref() {
|
||||
extra.push(format!("--{mode}"));
|
||||
}
|
||||
extra.extend(tool_args);
|
||||
extra.extend(args.into_iter().flat_map(|a| ["--dart-entrypoint-args".to_owned(), a]));
|
||||
Ok(flutter_run(name, self.root, &package, &entry, extra))
|
||||
}
|
||||
_ if program.is_none() => Err(SkipReason::NothingToRun),
|
||||
_ => {
|
||||
let mut words = vec!["run".to_owned()];
|
||||
words.extend(tool_args);
|
||||
words.push(self.path_from(entry.to_string_lossy().into_owned(), &dir));
|
||||
words.extend(args.into_iter().map(|a| self.path_from(a, &dir)));
|
||||
Ok(config(name, "dart", "dart".into(), words, Some("dart")))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `localRoot` (relative to the project root, empty for the root itself) and `remoteRoot`.
|
||||
fn roots(&self, obj: &Map<String, Value>, c: &mut RunConfig) -> Res<()> {
|
||||
if let Some(local) = self.string(obj, "localRoot")? {
|
||||
|
||||
@@ -229,6 +229,15 @@ fn match_console_encoding(
|
||||
fix.notice
|
||||
}
|
||||
|
||||
/// A script without the execute bit as `/bin/sh <script>` (see [`ide_core::process::needs_sh`]).
|
||||
/// Applied last, so the encoding and Java fixes above still see the script itself.
|
||||
fn sh_for_unexecutable(inv: &mut Invocation) {
|
||||
if !inv.shell && ide_core::process::needs_sh(&inv.program) {
|
||||
let script = std::mem::replace(&mut inv.program, "/bin/sh".into());
|
||||
inv.args.insert(0, script.to_string_lossy().into_owned());
|
||||
}
|
||||
}
|
||||
|
||||
/// A launch's pathing jar / argfile, deleted when dropped (the process exited, or never started).
|
||||
struct TempFile(Option<PathBuf>);
|
||||
|
||||
@@ -382,6 +391,7 @@ impl ProcessManager {
|
||||
let notice =
|
||||
if extras.emulate_terminal { None } else { match_console_encoding(&mut inv, &mut env, config, options) };
|
||||
let temp = shorten_java(&mut inv, config, &cwd)?;
|
||||
sh_for_unexecutable(&mut inv);
|
||||
if extras.emulate_terminal && followup.is_some() {
|
||||
return Err(IdeError::invalid("Go build and run requires the output console"));
|
||||
}
|
||||
@@ -1397,6 +1407,38 @@ fn input_writer(
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn scripts_without_the_execute_bit_run_through_sh() {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let script = dir.path().join("gradlew");
|
||||
std::fs::write(&script, "#!/bin/sh\n").unwrap();
|
||||
std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
let inv = || Invocation {
|
||||
program: script.clone(),
|
||||
args: vec!["build".into()],
|
||||
raw_args: false,
|
||||
shell: false,
|
||||
display: "./gradlew build".into(),
|
||||
};
|
||||
let mut plain = inv();
|
||||
sh_for_unexecutable(&mut plain);
|
||||
assert_eq!(plain.program, PathBuf::from("/bin/sh"));
|
||||
assert_eq!(plain.args, [script.to_string_lossy().as_ref(), "build"]);
|
||||
assert_eq!(plain.display, "./gradlew build");
|
||||
std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||
let mut executable = inv();
|
||||
sh_for_unexecutable(&mut executable);
|
||||
assert_eq!(executable.program, script);
|
||||
// Not a `#!` script (a binary that lost its mode): left to fail as it is.
|
||||
std::fs::write(&script, b"\x7fELF").unwrap();
|
||||
std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o644)).unwrap();
|
||||
let mut binary = inv();
|
||||
sh_for_unexecutable(&mut binary);
|
||||
assert_eq!(binary.program, script);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shell_lines_use_cmd_verbatim_on_windows() {
|
||||
let line = r#"(if not exist "C:\T\openidea-run" mkdir "C:\T\openidea-run") && "C:\Program Files\rustc.exe" -o "C:\T\openidea-run\hi.exe" hi.rs"#;
|
||||
|
||||
@@ -1150,3 +1150,67 @@ fn imports_go_application_and_test_configurations() {
|
||||
assert_eq!(test.extras.params["pattern"], "TestLogin");
|
||||
assert_eq!(test.extras.params["module"], "pkg");
|
||||
}
|
||||
|
||||
// What `flutter create` writes to `.idea/runConfigurations/main_dart.xml`; the Flutter plugin's
|
||||
// `SdkFields` serializes `filePath`, `additionalArgs`, `buildFlavor`, `attachArgs` and `envs` as options:
|
||||
// https://github.com/flutter/flutter-intellij/blob/main/src/io/flutter/run/SdkFields.java
|
||||
const FLUTTER_MAIN: &str = r#"<configuration default="false" name="NAME" type="FlutterRunConfigurationType" factoryName="Flutter">
|
||||
<option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
|
||||
<method v="2" />
|
||||
</configuration>"#;
|
||||
|
||||
const PUBSPEC_FLUTTER: &str = "name: my_app\ndependencies:\n flutter:\n sdk: flutter\n";
|
||||
|
||||
#[test]
|
||||
fn flutter_main_dart_from_flutter_create_is_the_detected_configuration() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let root = dir.path();
|
||||
write(root, "pubspec.yaml", PUBSPEC_FLUTTER);
|
||||
write(root, "lib/main.dart", "void main() {}\n");
|
||||
write(root, ".idea/runConfigurations/main_dart.xml", &run_file("main.dart", FLUTTER_MAIN));
|
||||
|
||||
let alone = import_from(root, &[]);
|
||||
let c = get(&alone, "main.dart");
|
||||
assert_eq!((c.kind.as_str(), c.command.as_str()), ("flutter", "flutter"));
|
||||
assert_eq!(c.args, s(&["run", "-t", "lib/main.dart"]));
|
||||
assert_eq!((cwd(c), c.debug_adapter.as_deref()), (None, Some("dart")));
|
||||
|
||||
// Next to the detected `flutter run`, the same run is not listed twice.
|
||||
let r = import_from(root, &ide_run::detect(root));
|
||||
assert!(r.imported.is_empty(), "{r:#?}");
|
||||
assert_eq!(reason(&r, "main.dart"), &SkipReason::SameAs { existing: "flutter run".into() });
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flutter_flavors_entry_points_arguments_and_envs() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let root = dir.path();
|
||||
write(root, "app/pubspec.yaml", PUBSPEC_FLUTTER);
|
||||
write(root, "app/lib/main_dev.dart", "void main() {}\n");
|
||||
let dev = r#"<configuration name="Dev" type="FlutterRunConfigurationType" factoryName="Flutter">
|
||||
<option name="additionalArgs" value="--dart-define=API="https://dev.example" --verbose" />
|
||||
<option name="attachArgs" value="--debug-port 9000" />
|
||||
<option name="buildFlavor" value="dev" />
|
||||
<option name="envs"><map><entry key="FLUTTER_LOG" value="1" /></map></option>
|
||||
<option name="filePath" value="$PROJECT_DIR$/app/lib/main_dev.dart" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="Gone" type="FlutterRunConfigurationType" factoryName="Flutter">
|
||||
<option name="filePath" value="$PROJECT_DIR$/elsewhere/main.dart" />
|
||||
</configuration>
|
||||
<configuration name="No entry" type="FlutterRunConfigurationType" factoryName="Flutter" />"#;
|
||||
write(root, ".idea/workspace.xml", &workspace(dev));
|
||||
|
||||
let r = import_from(root, &ide_run::detect(root));
|
||||
let c = get(&r, "Dev");
|
||||
assert_eq!(c.kind, "flutter");
|
||||
assert_eq!(
|
||||
c.args,
|
||||
s(&["run", "-t", "lib/main_dev.dart", "--dart-define=API=https://dev.example", "--verbose", "--flavor=dev"])
|
||||
);
|
||||
assert_eq!(cwd(c), Some(PathBuf::from("app")));
|
||||
assert_eq!(c.env, BTreeMap::from([("FLUTTER_LOG".into(), "1".into())]));
|
||||
assert_eq!(ignored(&r, "Dev"), ["attachArgs"]);
|
||||
assert_eq!(reason(&r, "Gone"), &SkipReason::MissingFile { file: "pubspec.yaml".into() });
|
||||
assert_eq!(reason(&r, "No entry"), &SkipReason::NothingToRun);
|
||||
}
|
||||
@@ -555,3 +555,108 @@ fn existing_names_match_without_surrounding_spaces() {
|
||||
let r = import_from(dir.path(), &[existing]);
|
||||
assert_eq!(reason(&r, "Django"), &SkipReason::NameTaken);
|
||||
}
|
||||
|
||||
const PUBSPEC_FLUTTER: &str = "name: my_app\ndependencies:\n flutter:\n sdk: flutter\n";
|
||||
|
||||
fn write(root: &Path, rel: &str, text: &str) {
|
||||
let path = root.join(rel);
|
||||
fs::create_dir_all(path.parent().unwrap()).unwrap();
|
||||
fs::write(path, text).unwrap();
|
||||
}
|
||||
|
||||
// The configurations Dart Code adds to a Flutter app's launch.json.
|
||||
const FLUTTER: &str = r#"{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{ "name": "my_app", "request": "launch", "type": "dart" },
|
||||
{ "name": "my_app (profile mode)", "request": "launch", "type": "dart", "flutterMode": "profile" },
|
||||
{ "name": "my_app (release mode)", "request": "launch", "type": "dart", "flutterMode": "release" },
|
||||
{ "name": "Attach", "request": "attach", "type": "dart" }
|
||||
],
|
||||
"compounds": [{ "name": "Both", "configurations": ["my_app", "my_app (profile mode)"] }]
|
||||
}"#;
|
||||
|
||||
#[test]
|
||||
fn flutter_launches_from_dart_code_next_to_the_detected_configuration() {
|
||||
let dir = project(FLUTTER);
|
||||
let root = dir.path();
|
||||
write(root, "pubspec.yaml", PUBSPEC_FLUTTER);
|
||||
write(root, "lib/main.dart", "void main() {}\n");
|
||||
let r = import_from(root, &ide_run::detect(root));
|
||||
assert_eq!(reason(&r, "my_app"), &SkipReason::SameAs { existing: "flutter run".into() });
|
||||
for (name, mode) in [("my_app (profile mode)", "--profile"), ("my_app (release mode)", "--release")] {
|
||||
let c = get(&r, name);
|
||||
assert_eq!(
|
||||
(c.kind.as_str(), c.command.as_str(), c.debug_adapter.as_deref()),
|
||||
("flutter", "flutter", Some("dart"))
|
||||
);
|
||||
assert_eq!(c.args, s(&["run", "-t", "lib/main.dart", mode]));
|
||||
assert_eq!(cwd(c), None);
|
||||
}
|
||||
assert_eq!(reason(&r, "Attach"), &SkipReason::UnsupportedRequest { request: "attach".into() });
|
||||
// A compound naming the left-out entry starts the detected configuration.
|
||||
assert_eq!(
|
||||
get(&r, "Both").extras.compound,
|
||||
["flutter:run".to_owned(), get(&r, "my_app (profile mode)").id.clone()]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn flutter_entry_device_tool_and_app_arguments_in_a_subfolder() {
|
||||
let dir = project(
|
||||
r#"{ "configurations": [
|
||||
{ "name": "Dev", "request": "launch", "type": "dart", "cwd": "${workspaceFolder}/app",
|
||||
"program": "lib/main_dev.dart", "deviceId": "chrome", "args": ["--seed", "1"],
|
||||
"toolArgs": ["--flavor", "dev", "--dart-define=ENV=dev"], "vmAdditionalArgs": ["--x"] },
|
||||
{ "name": "From the root", "request": "launch", "type": "dart", "program": "app/lib/main_dev.dart" }
|
||||
] }"#,
|
||||
);
|
||||
let root = dir.path();
|
||||
write(root, "app/pubspec.yaml", PUBSPEC_FLUTTER);
|
||||
write(root, "app/lib/main_dev.dart", "void main() {}\n");
|
||||
let r = import_from(root, &[]);
|
||||
let c = get(&r, "Dev");
|
||||
assert_eq!(
|
||||
c.args,
|
||||
s(&[
|
||||
"run",
|
||||
"-t",
|
||||
"lib/main_dev.dart",
|
||||
"-d",
|
||||
"chrome",
|
||||
"--flavor",
|
||||
"dev",
|
||||
"--dart-define=ENV=dev",
|
||||
"--dart-entrypoint-args",
|
||||
"--seed",
|
||||
"--dart-entrypoint-args",
|
||||
"1",
|
||||
])
|
||||
);
|
||||
assert_eq!(cwd(c), Some(PathBuf::from("app")));
|
||||
assert_eq!(ignored(&r, "Dev"), ["vmAdditionalArgs"]);
|
||||
// A program path from the workspace folder runs in its package too.
|
||||
let c = get(&r, "From the root");
|
||||
assert_eq!((c.args.clone(), cwd(c)), (s(&["run", "-t", "lib/main_dev.dart"]), Some(PathBuf::from("app"))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dart_programs_outside_flutter_run_with_dart() {
|
||||
let dir = project(
|
||||
r#"{ "configurations": [
|
||||
{ "name": "Server", "request": "launch", "type": "dart", "program": "bin/server.dart",
|
||||
"args": ["--port", "8080"], "toolArgs": ["--enable-asserts"] },
|
||||
{ "name": "Server (absolute)", "request": "launch", "type": "dart", "program": "${workspaceFolder}/bin/server.dart" },
|
||||
{ "name": "Nothing", "request": "launch", "type": "dart" }
|
||||
] }"#,
|
||||
);
|
||||
let root = dir.path();
|
||||
write(root, "pubspec.yaml", "name: server\n");
|
||||
write(root, "bin/server.dart", "void main() {}\n");
|
||||
let r = import_from(root, &[]);
|
||||
let c = get(&r, "Server");
|
||||
assert_eq!((c.kind.as_str(), c.command.as_str(), c.debug_adapter.as_deref()), ("dart", "dart", Some("dart")));
|
||||
assert_eq!(c.args, s(&["run", "--enable-asserts", "bin/server.dart", "--port", "8080"]));
|
||||
assert_eq!(get(&r, "Server (absolute)").args, s(&["run", "bin/server.dart"]));
|
||||
assert_eq!(reason(&r, "Nothing"), &SkipReason::NothingToRun);
|
||||
}
|
||||
@@ -680,17 +680,50 @@ fn xml_escape(text: &str) -> String {
|
||||
text.replace('&', "&").replace('<', "<").replace('>', ">")
|
||||
}
|
||||
|
||||
/// Inserts `<localRepository>` right after the `<settings>` open tag.
|
||||
fn inject_local_repository(settings_xml: &str, repo: &str) -> Option<String> {
|
||||
let start = settings_xml.find("<settings")?;
|
||||
let end = settings_xml[start..].find('>')? + start;
|
||||
let mut out = String::with_capacity(settings_xml.len() + repo.len() + 40);
|
||||
out.push_str(&settings_xml[..=end]);
|
||||
out.push_str("<localRepository>");
|
||||
out.push_str(&xml_escape(repo));
|
||||
out.push_str("</localRepository>");
|
||||
out.push_str(&settings_xml[end + 1..]);
|
||||
Some(out)
|
||||
/// `settings_xml` with `<localRepository>` set to `repo`: an existing one is replaced, else
|
||||
/// one goes right after the `<settings>` open tag. `None` without a `<settings>` element.
|
||||
pub(crate) fn with_local_repository(settings_xml: &str, repo: &str) -> Option<String> {
|
||||
use crate::maven_profiles::{find_tag, mask_comments};
|
||||
let masked = mask_comments(settings_xml);
|
||||
let element = format!("<localRepository>{}</localRepository>", xml_escape(repo));
|
||||
if let Some(start) = find_tag(&masked, "<localRepository", 0) {
|
||||
let open_end = start + masked[start..].find('>')?;
|
||||
let end = if masked[..open_end].ends_with('/') {
|
||||
open_end + 1
|
||||
} else {
|
||||
let close = open_end + masked[open_end..].find("</localRepository")?;
|
||||
close + masked[close..].find('>')? + 1
|
||||
};
|
||||
return Some(format!("{}{element}{}", &settings_xml[..start], &settings_xml[end..]));
|
||||
}
|
||||
let start = find_tag(&masked, "<settings", 0)?;
|
||||
let end = start + masked[start..].find('>')?;
|
||||
if masked[..end].ends_with('/') {
|
||||
return None;
|
||||
}
|
||||
Some(format!("{}{element}{}", &settings_xml[..=end], &settings_xml[end + 1..]))
|
||||
}
|
||||
|
||||
/// The user settings m2e (the JDTLS Maven import) reads, as a file and its text: the
|
||||
/// configured `settings.xml`, else `~/.m2/settings.xml`, with the configured local
|
||||
/// repository as its `<localRepository>`. m2e reads mirrors, servers and the local
|
||||
/// repository from this file only, never from `-Dmaven.repo.local`, which is how the IDE's
|
||||
/// own `mvn` runs get the configured repository (#1739). The file is `None` when there is none.
|
||||
pub(crate) fn m2e_user_settings(root: &Path, s: &Settings, home: &Path) -> (Option<PathBuf>, String) {
|
||||
let m = &s.languages.java.maven;
|
||||
let file = setting_path(root, &m.user_settings)
|
||||
.or_else(|| Some(home.join(".m2").join("settings.xml")).filter(|f| f.is_file()));
|
||||
let text = file
|
||||
.as_ref()
|
||||
.and_then(|f| std::fs::read_to_string(f).ok())
|
||||
.unwrap_or_else(|| "<settings>\n</settings>\n".into());
|
||||
match setting_path(root, &m.local_repository) {
|
||||
Some(repo) => {
|
||||
let merged = with_local_repository(&text, &repo.to_string_lossy());
|
||||
(file, merged.unwrap_or(text))
|
||||
}
|
||||
None => (file, text),
|
||||
}
|
||||
}
|
||||
|
||||
fn write_m2e_settings(root: &Path, text: &str) -> Option<PathBuf> {
|
||||
@@ -705,32 +738,36 @@ fn write_m2e_settings(root: &Path, text: &str) -> Option<PathBuf> {
|
||||
Some(file)
|
||||
}
|
||||
|
||||
/// The user settings file m2e (the JDTLS Maven import) should read: the
|
||||
/// configured `settings.xml` when it already declares `<localRepository>`,
|
||||
/// else a derived copy under `<root>/.openidea/` with the configured local
|
||||
/// repository injected. m2e resolves the local repository from the settings
|
||||
/// XML, not from `-Dmaven.repo.local`, so without this the import downloads
|
||||
/// into `~/.m2/repository` even when the IDE's own `mvn` runs honor the
|
||||
/// configured path (#1739). `None` = m2e's default applies.
|
||||
/// The user settings file m2e should read (see [`m2e_user_settings`]): the configured
|
||||
/// `settings.xml` as it is when no local repository is configured or it already names that
|
||||
/// one, else a derived copy under `<root>/.openidea/`. `None` = m2e's default applies.
|
||||
pub fn maven_user_settings_for_m2e(root: &Path, s: &Settings) -> Option<PathBuf> {
|
||||
maven_user_settings_for_m2e_in(root, s, &crate::home_dir().unwrap_or_default())
|
||||
}
|
||||
|
||||
pub(crate) fn maven_user_settings_for_m2e_in(root: &Path, s: &Settings, home: &Path) -> Option<PathBuf> {
|
||||
let m = &s.languages.java.maven;
|
||||
if let Some(file) = setting_path(root, &m.user_settings) {
|
||||
let text = std::fs::read_to_string(&file).ok()?;
|
||||
if crate::java::xml_value(&crate::lombok::strip_xml_comments(&text), "localRepository").is_some() {
|
||||
return Some(file);
|
||||
}
|
||||
if let Some(repo) = setting_path(root, &m.local_repository) {
|
||||
let merged = inject_local_repository(&text, &repo.to_string_lossy())?;
|
||||
if let Some(derived) = write_m2e_settings(root, &merged) {
|
||||
return Some(derived);
|
||||
}
|
||||
}
|
||||
return Some(file);
|
||||
let configured = setting_path(root, &m.user_settings);
|
||||
setting_path(root, &m.local_repository)?;
|
||||
let (file, text) = m2e_user_settings(root, s, home);
|
||||
if file.as_ref().and_then(|f| std::fs::read_to_string(f).ok()).is_some_and(|original| original == text) {
|
||||
return file;
|
||||
}
|
||||
let repo = setting_path(root, &m.local_repository)?;
|
||||
let minimal =
|
||||
format!("<settings><localRepository>{}</localRepository></settings>", xml_escape(&repo.to_string_lossy()));
|
||||
write_m2e_settings(root, &minimal)
|
||||
write_m2e_settings(root, &text).or(configured)
|
||||
}
|
||||
|
||||
/// `conf/settings.xml` of the Maven installation the IDE's `mvn` runs use (Settings ›
|
||||
/// Maven home, a version manager's pin, else `mvn` on `PATH`; none with a project wrapper):
|
||||
/// `mvn` reads its mirrors and repositories as global settings, m2e only when told to.
|
||||
pub fn maven_global_settings(root: &Path, s: &Settings) -> Option<PathBuf> {
|
||||
let mvn = match maven_command(root, s) {
|
||||
Some(mvn) => mvn,
|
||||
None if root.join("mvnw").is_file() || root.join("mvnw.cmd").is_file() => return None,
|
||||
None => crate::exec::which("mvn")?,
|
||||
};
|
||||
let mvn = dunce::canonicalize(&mvn).unwrap_or(mvn);
|
||||
let file = mvn.parent()?.parent()?.join("conf").join("settings.xml");
|
||||
file.is_file().then_some(file)
|
||||
}
|
||||
|
||||
/// TypeScript `lib` directory for the selected version; `None` = the server's bundled one.
|
||||
@@ -1070,6 +1107,13 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
|
||||
}
|
||||
cfg.command = custom.to_string_lossy().into_owned();
|
||||
}
|
||||
// `java -jar` servers run on the project JDK when there is one, like JAR Application runs.
|
||||
if cfg.command == "java"
|
||||
&& let Some(java) =
|
||||
project_jdk(root, s).map(|jdk| crate::java::java_executable(&jdk.home)).filter(|j| j.is_file())
|
||||
{
|
||||
cfg.command = java.to_string_lossy().into_owned();
|
||||
}
|
||||
let name = cfg.name.clone();
|
||||
let name = name.as_str();
|
||||
|
||||
@@ -1230,6 +1274,13 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
|
||||
json!({ "settings": { "java": { "configuration": { "maven": { "userSettings": file } } } } }),
|
||||
);
|
||||
}
|
||||
if let Some(file) = maven_global_settings(root, s) {
|
||||
let file = file.to_string_lossy();
|
||||
merge_init_options(
|
||||
cfg,
|
||||
json!({ "settings": { "java": { "configuration": { "maven": { "globalSettings": file } } } } }),
|
||||
);
|
||||
}
|
||||
// The JVM system property is still forwarded for JVM-level consumers,
|
||||
// but it is the settings file above that m2e honors. A
|
||||
// `-Dmaven.repo.local` the user put in their own jdtls VM options wins.
|
||||
@@ -1247,6 +1298,21 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
|
||||
}
|
||||
}
|
||||
|
||||
if name == "java-analyzer" {
|
||||
// Unset, java-analyzer finds a JDK and the Maven local repository the way Maven does;
|
||||
// the server's own `initializationOptions` in settings are merged later and win.
|
||||
let mut layer = serde_json::Map::new();
|
||||
if let Some(jdk) = project_jdk(root, s) {
|
||||
layer.insert("jdkHome".into(), json!(jdk.home.to_string_lossy()));
|
||||
}
|
||||
if let Some(repo) = maven_local_repository(root, s) {
|
||||
layer.insert("maven".into(), json!({ "localRepository": repo.to_string_lossy() }));
|
||||
}
|
||||
if !layer.is_empty() {
|
||||
merge_init_options(cfg, Value::Object(layer));
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(lib) = tsdk(server_root, s).or_else(|| tsdk(root, s)) {
|
||||
let lib_s = lib.to_string_lossy().into_owned();
|
||||
match name {
|
||||
@@ -1405,6 +1471,23 @@ pub fn language_servers(language: &str, defined: &[LanguageServerConfig], s: &Se
|
||||
out
|
||||
}
|
||||
|
||||
/// Built-in servers given an executable path in Settings › Language Servers, as
|
||||
/// (definition's command, path): they run that executable (see [`server_launch_overrides`]).
|
||||
pub fn server_command_paths<'a>(
|
||||
servers: impl IntoIterator<Item = &'a LanguageServerConfig>,
|
||||
root: &Path,
|
||||
s: &Settings,
|
||||
) -> Vec<(String, PathBuf)> {
|
||||
servers
|
||||
.into_iter()
|
||||
.filter_map(|server| {
|
||||
let command = s.language_servers.get(&server.name)?.command.trim();
|
||||
let path = command.contains(['/', '\\']).then(|| setting_path(root, command))??;
|
||||
Some((server.command.clone(), path))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Adds the servers defined in settings to the languages they serve (to list
|
||||
/// them with the tools); disabled ones stay so they can be turned back on.
|
||||
pub fn with_custom_servers(langs: &mut [LanguageConfig], s: &Settings) {
|
||||
@@ -1459,6 +1542,12 @@ pub fn server_launch_overrides(cfg: &mut LanguageServerConfig, s: &Settings) {
|
||||
if let Some(args) = &ls.args {
|
||||
cfg.args = args.clone();
|
||||
}
|
||||
// A server shipped as a runnable jar (groovy-language-server-all.jar) runs on `java -jar`;
|
||||
// `configure_server` then picks the project JDK's `java`.
|
||||
if Path::new(&cfg.command).extension().is_some_and(|e| e.eq_ignore_ascii_case("jar")) {
|
||||
let jar = std::mem::replace(&mut cfg.command, "java".to_owned());
|
||||
cfg.args.splice(0..0, ["-jar".to_owned(), jar]);
|
||||
}
|
||||
}
|
||||
|
||||
/// Environment, features, `initializationOptions` and `workspace/configuration`
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
//! user `settings.xml`. The profiles chosen in the Maven tool window are therefore
|
||||
//! passed as a copy of the user's settings with those profiles activated.
|
||||
|
||||
use crate::apply::setting_path;
|
||||
use ide_core::settings::Settings;
|
||||
use ide_language::LanguageServerConfig;
|
||||
use serde_json::{Value, json};
|
||||
@@ -32,13 +31,24 @@ pub fn configure_jdtls(cfg: &mut LanguageServerConfig, root: &Path, s: &Settings
|
||||
}
|
||||
}
|
||||
|
||||
/// The user's settings (Settings › Maven, else `~/.m2/settings.xml`) with `active`
|
||||
/// added to `<activeProfiles>`. Named after its content: m2e reloads a settings file
|
||||
/// only when the configured path changes.
|
||||
/// The Maven tool window's offline mode of the last sync, for jdtls (m2e) too: without it the
|
||||
/// import keeps downloading from the repositories while `mvn` runs with `-o`.
|
||||
pub fn configure_offline(cfg: &mut LanguageServerConfig, offline: bool) {
|
||||
if cfg.name != "jdtls" {
|
||||
return;
|
||||
}
|
||||
let layer = json!({ "java": { "import": { "maven": { "offline": { "enabled": offline } } } } });
|
||||
match &mut cfg.settings {
|
||||
Some(settings) => merge(settings, layer),
|
||||
None => cfg.settings = Some(layer),
|
||||
}
|
||||
}
|
||||
|
||||
/// The user settings m2e reads (Settings › Maven, else `~/.m2/settings.xml`, with the
|
||||
/// configured local repository) with `active` added to `<activeProfiles>`. Named after its
|
||||
/// content: m2e reloads a settings file only when the configured path changes.
|
||||
fn write_settings(root: &Path, s: &Settings, active: &[&str], dir: &Path) -> Option<PathBuf> {
|
||||
let user = setting_path(root, &s.languages.java.maven.user_settings)
|
||||
.or_else(|| crate::home_dir().map(|h| h.join(".m2").join("settings.xml")));
|
||||
let base = user.and_then(|f| std::fs::read_to_string(f).ok()).unwrap_or_else(|| "<settings>\n</settings>\n".into());
|
||||
let (_, base) = crate::apply::m2e_user_settings(root, s, &crate::home_dir().unwrap_or_default());
|
||||
let Some(text) = with_active_profiles(&base, active) else {
|
||||
tracing::warn!("Maven profiles not passed to jdtls: the user settings.xml has no <settings> element");
|
||||
return None;
|
||||
@@ -91,7 +101,7 @@ pub fn with_active_profiles(text: &str, ids: &[&str]) -> Option<String> {
|
||||
}
|
||||
|
||||
/// Start of the element `open` (`<name`), not a longer name sharing its prefix.
|
||||
fn find_tag(masked: &str, open: &str, from: usize) -> Option<usize> {
|
||||
pub(crate) fn find_tag(masked: &str, open: &str, from: usize) -> Option<usize> {
|
||||
let mut at = from;
|
||||
while let Some(i) = masked[at..].find(open) {
|
||||
let start = at + i;
|
||||
@@ -105,7 +115,7 @@ fn find_tag(masked: &str, open: &str, from: usize) -> Option<usize> {
|
||||
}
|
||||
|
||||
/// `text` with comments and CDATA blanked out, byte offsets unchanged.
|
||||
fn mask_comments(text: &str) -> String {
|
||||
pub(crate) fn mask_comments(text: &str) -> String {
|
||||
let mut out = text.as_bytes().to_vec();
|
||||
let mut at = 0;
|
||||
while at < text.len() {
|
||||
@@ -216,6 +226,24 @@ mod tests {
|
||||
assert!(text.contains("<activeProfile>c</activeProfile>"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn jdtls_imports_offline_when_the_last_sync_was_offline() {
|
||||
let offline = |cfg: &LanguageServerConfig| {
|
||||
cfg.settings.as_ref().and_then(|s| s.pointer("/java/import/maven/offline/enabled")).cloned()
|
||||
};
|
||||
for value in [true, false] {
|
||||
let mut cfg = jdtls();
|
||||
cfg.settings = Some(json!({ "java": { "import": { "maven": { "enabled": true } } } }));
|
||||
configure_offline(&mut cfg, value);
|
||||
assert_eq!(offline(&cfg), Some(json!(value)), "explicit, so turning it off reaches a running server");
|
||||
assert_eq!(cfg.settings.as_ref().unwrap().pointer("/java/import/maven/enabled"), Some(&json!(true)));
|
||||
}
|
||||
let mut other: LanguageServerConfig =
|
||||
serde_json::from_value(json!({ "name": "kotlin-lsp", "command": "kotlin-lsp" })).unwrap();
|
||||
configure_offline(&mut other, true);
|
||||
assert_eq!(other.settings, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn jdtls_imports_with_the_synced_profiles() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
@@ -255,6 +283,15 @@ mod tests {
|
||||
}
|
||||
assert!(!Path::new(&second).exists());
|
||||
|
||||
// The local repository of Settings › Maven stays in the copy (#1739).
|
||||
s.languages.java.maven.local_repository = tmp.path().join("configured").to_string_lossy().into_owned();
|
||||
let mut cfg = jdtls();
|
||||
configure_jdtls(&mut cfg, tmp.path(), &s, &profiles(&["native"]), &dir);
|
||||
let text = std::fs::read_to_string(user_settings(&cfg).unwrap()).unwrap();
|
||||
let expected =
|
||||
format!("<localRepository>{}</localRepository>", tmp.path().join("configured").to_string_lossy());
|
||||
assert!(text.contains(&expected) && !text.contains("/repo<"), "{text}");
|
||||
|
||||
let mut other_server: LanguageServerConfig =
|
||||
serde_json::from_value(json!({ "name": "kotlin-lsp", "command": "kotlin-lsp" })).unwrap();
|
||||
configure_jdtls(&mut other_server, tmp.path(), &s, &profiles(&["native"]), &dir);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
use crate::apply::{
|
||||
apply_to_run_configs, apply_to_run_configs_in, configure_python_extra_paths, configure_server,
|
||||
configure_vue_module_resolution, jdtls_jdk, maven_command, maven_options, project_jdk, python_interpreter,
|
||||
ruff_configuration, terminal_activation, tool_install_environment, tsdk, without_derived, without_derived_in,
|
||||
ruff_configuration, server_command_paths, server_protocol_overrides, terminal_activation, tool_install_environment,
|
||||
tsdk, without_derived, without_derived_in,
|
||||
};
|
||||
use crate::python::parse_pip_list;
|
||||
use crate::{bin_dir, exe, venv_of};
|
||||
@@ -340,6 +341,39 @@ fn jdtls_honors_the_configured_maven_local_repository() {
|
||||
assert!(cfg.args.iter().all(|a| !a.contains("maven.repo.local")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn java_analyzer_gets_the_project_jdk_and_maven_local_repository() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let configured = |s: &Settings| {
|
||||
let mut cfg = server("java-analyzer");
|
||||
configure_server(&mut cfg, tmp.path(), tmp.path(), s);
|
||||
server_protocol_overrides(&mut cfg, s);
|
||||
cfg.initialization_options.map(|v| serde_json::to_value(v).unwrap())
|
||||
};
|
||||
// Unset: the server discovers both itself.
|
||||
assert_eq!(configured(&Settings::default()), None);
|
||||
let jdk = tmp.path().join("jdk17");
|
||||
fake_jdk(&jdk);
|
||||
let repo = tmp.path().join("m2-repo");
|
||||
let mut s = Settings::default();
|
||||
s.languages.java.jdk = jdk.to_string_lossy().into_owned();
|
||||
s.languages.java.maven.local_repository = repo.to_string_lossy().into_owned();
|
||||
let options = configured(&s).unwrap();
|
||||
assert_eq!(options["jdkHome"], dunce::canonicalize(&jdk).unwrap().to_string_lossy().as_ref());
|
||||
assert_eq!(options["maven"]["localRepository"], repo.to_string_lossy().as_ref());
|
||||
// A `jdkHome` in the server's own settings wins.
|
||||
s.language_servers.insert(
|
||||
"java-analyzer".into(),
|
||||
ide_core::settings::LanguageServerSettings {
|
||||
initialization_options: Some(serde_json::json!({ "jdkHome": "/opt/jdk21" })),
|
||||
..Default::default()
|
||||
},
|
||||
);
|
||||
let options = configured(&s).unwrap();
|
||||
assert_eq!(options["jdkHome"], "/opt/jdk21");
|
||||
assert_eq!(options["maven"]["localRepository"], repo.to_string_lossy().as_ref());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn jdtls_m2e_gets_effective_settings_with_local_repository() {
|
||||
fn user_settings(cfg: &LanguageServerConfig) -> Option<std::path::PathBuf> {
|
||||
@@ -375,18 +409,96 @@ fn jdtls_m2e_gets_effective_settings_with_local_repository() {
|
||||
assert!(text.contains("<mirror><id>m</id></mirror>"));
|
||||
assert!(text.contains(&format!("<localRepository>{}</localRepository>", repo.to_string_lossy())));
|
||||
|
||||
// User settings already declaring `<localRepository>`: passed through untouched.
|
||||
std::fs::write(&settings, "<settings><localRepository>/user/repo</localRepository></settings>").unwrap();
|
||||
// User settings already naming the configured repository: passed through untouched.
|
||||
let own = format!("<settings><localRepository>{}</localRepository></settings>", repo.to_string_lossy());
|
||||
std::fs::write(&settings, &own).unwrap();
|
||||
let mut cfg = server("jdtls");
|
||||
configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
|
||||
assert_eq!(user_settings(&cfg), Some(settings.clone()));
|
||||
|
||||
// Another repository: the configured one wins, as `-Dmaven.repo.local` does for `mvn`.
|
||||
std::fs::write(&settings, "<settings>\n <localRepository>/user/repo</localRepository><mirrors/></settings>")
|
||||
.unwrap();
|
||||
let mut cfg = server("jdtls");
|
||||
configure_server(&mut cfg, tmp.path(), tmp.path(), &s);
|
||||
assert_eq!(user_settings(&cfg), Some(derived.clone()));
|
||||
let text = std::fs::read_to_string(&derived).unwrap();
|
||||
assert!(text.contains("<mirrors/>") && !text.contains("/user/repo"), "{text}");
|
||||
assert_eq!(text.matches("<localRepository>").count(), 1, "{text}");
|
||||
|
||||
// Settings user settings unset: the configured repository has no settings file
|
||||
// replacing `~/.m2/settings.xml` without its mirrors.
|
||||
let home = tmp.path().join("home");
|
||||
std::fs::create_dir_all(home.join(".m2")).unwrap();
|
||||
std::fs::write(
|
||||
home.join(".m2/settings.xml"),
|
||||
"<settings><mirrors><mirror><id>corp</id></mirror></mirrors></settings>",
|
||||
)
|
||||
.unwrap();
|
||||
let mut only_repo = Settings::default();
|
||||
only_repo.languages.java.maven.local_repository = repo.to_string_lossy().into_owned();
|
||||
let file = crate::apply::maven_user_settings_for_m2e_in(tmp.path(), &only_repo, &home).unwrap();
|
||||
let text = std::fs::read_to_string(file).unwrap();
|
||||
assert!(text.contains("<mirror><id>corp</id></mirror>"), "{text}");
|
||||
assert!(text.contains(&format!("<localRepository>{}</localRepository>", repo.to_string_lossy())));
|
||||
// Neither a local repository nor user settings: `~/.m2/settings.xml` is m2e's own default.
|
||||
assert_eq!(crate::apply::maven_user_settings_for_m2e_in(tmp.path(), &Settings::default(), &home), None);
|
||||
|
||||
// Neither configured: no userSettings at all.
|
||||
let mut cfg = server("jdtls");
|
||||
configure_server(&mut cfg, tmp.path(), tmp.path(), &Settings::default());
|
||||
assert_eq!(user_settings(&cfg), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn local_repository_goes_into_every_shape_of_settings_xml() {
|
||||
use crate::apply::with_local_repository;
|
||||
let element = "<localRepository>/r&d</localRepository>";
|
||||
for (text, expected) in [
|
||||
("<settings>\n</settings>", format!("<settings>{element}\n</settings>")),
|
||||
("<settings><localRepository>/old</localRepository></settings>", format!("<settings>{element}</settings>")),
|
||||
("<settings><localRepository /></settings>", format!("<settings>{element}</settings>")),
|
||||
(
|
||||
"<settings xmlns=\"x\"><!-- <localRepository>/c</localRepository> --></settings>",
|
||||
format!("<settings xmlns=\"x\">{element}<!-- <localRepository>/c</localRepository> --></settings>"),
|
||||
),
|
||||
(
|
||||
"<?xml version=\"1.0\"?>\n<!-- <settings> --><settings>\n <localRepository>\n /old\n </localRepository>\n</settings>",
|
||||
format!("<?xml version=\"1.0\"?>\n<!-- <settings> --><settings>\n {element}\n</settings>"),
|
||||
),
|
||||
] {
|
||||
assert_eq!(with_local_repository(text, "/r&d").as_deref(), Some(expected.as_str()), "{text}");
|
||||
}
|
||||
assert_eq!(with_local_repository("<settings/>", "/r"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn jdtls_m2e_reads_the_global_settings_of_the_maven_home() {
|
||||
fn global_settings(cfg: &LanguageServerConfig) -> Option<String> {
|
||||
let opts = serde_json::to_value(cfg.initialization_options.clone()?).ok()?;
|
||||
opts.pointer("/settings/java/configuration/maven/globalSettings")?.as_str().map(Into::into)
|
||||
}
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let home = tmp.path().join("apache-maven-3.9.9");
|
||||
let mvn = home.join("bin").join(if cfg!(windows) { "mvn.cmd" } else { "mvn" });
|
||||
std::fs::create_dir_all(mvn.parent().unwrap()).unwrap();
|
||||
std::fs::write(&mvn, "").unwrap();
|
||||
let mut s = Settings::default();
|
||||
s.languages.java.maven.home = home.to_string_lossy().into_owned();
|
||||
let configured = |s: &Settings| {
|
||||
let mut cfg = server("jdtls");
|
||||
configure_server(&mut cfg, tmp.path(), tmp.path(), s);
|
||||
global_settings(&cfg)
|
||||
};
|
||||
// No `conf/settings.xml`: nothing to pass.
|
||||
assert_eq!(configured(&s), None);
|
||||
let conf = home.join("conf").join("settings.xml");
|
||||
std::fs::create_dir_all(conf.parent().unwrap()).unwrap();
|
||||
std::fs::write(&conf, "<settings><mirrors/></settings>").unwrap();
|
||||
let expected = dunce::canonicalize(&conf).unwrap();
|
||||
assert_eq!(configured(&s).map(std::path::PathBuf::from), Some(expected));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rust_analyzer_check_command_and_toolchain() {
|
||||
if cfg!(windows) {
|
||||
@@ -1160,6 +1272,34 @@ fn language_server_settings_disable_add_and_override() {
|
||||
assert_eq!(parsed.code_action_kinds, Some(vec!["refactor".to_string()]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_server_path_to_a_jar_runs_with_java_jar() {
|
||||
use crate::apply::server_launch_overrides;
|
||||
use ide_core::settings::LanguageServerSettings;
|
||||
let mut s = Settings::default();
|
||||
let jar = "/opt/groovy/build/libs/groovy-language-server-all.JAR";
|
||||
s.language_servers.insert(
|
||||
"groovy-language-server".into(),
|
||||
LanguageServerSettings { command: jar.into(), args: Some(vec!["--verbose".into()]), ..Default::default() },
|
||||
);
|
||||
let mut groovy = server("groovy-language-server");
|
||||
server_launch_overrides(&mut groovy, &s);
|
||||
assert_eq!(groovy.command, "java");
|
||||
assert_eq!(groovy.args, ["-jar", jar, "--verbose"]);
|
||||
|
||||
// A project JDK is the one that runs it.
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let home = tmp.path().join("jdk");
|
||||
let java = crate::java::java_executable(&home);
|
||||
std::fs::create_dir_all(java.parent().unwrap()).unwrap();
|
||||
std::fs::write(&java, "").unwrap();
|
||||
std::fs::write(home.join("release"), "JAVA_VERSION=\"21.0.2\"\n").unwrap();
|
||||
s.languages.java.jdk = home.to_string_lossy().into_owned();
|
||||
configure_server(&mut groovy, tmp.path(), tmp.path(), &s);
|
||||
assert!(groovy.command.ends_with(&*Path::new("jdk").join(java.strip_prefix(&home).unwrap()).to_string_lossy()));
|
||||
assert!(Path::new(&groovy.command).is_file(), "{}", groovy.command);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ruff_configuration_directory_resolves_files_and_validates_pyproject() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
@@ -2962,3 +3102,26 @@ fn without_the_vue_plugin_the_module_resolution_plugin_stays_out() {
|
||||
assert!(!configure_vue_module_resolution(&mut cfg, tmp.path()));
|
||||
assert!(cfg.initialization_options.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn server_command_paths_report_executables_set_for_built_in_servers() {
|
||||
let servers = [server("java-analyzer"), server("jdtls"), server("kmp-lsp")];
|
||||
let mut s = Settings::default();
|
||||
let entry = |command: &str| ide_core::settings::LanguageServerSettings {
|
||||
command: command.into(),
|
||||
languages: vec!["java".into()],
|
||||
..Default::default()
|
||||
};
|
||||
s.language_servers.insert("java-analyzer".into(), entry("/opt/java-analyzer/bin/java-analyzer"));
|
||||
s.language_servers.insert("jdtls".into(), entry("bin/jdtls"));
|
||||
// A bare name is looked up like the definition's command.
|
||||
s.language_servers.insert("kmp-lsp".into(), entry("kmp-lsp-nightly"));
|
||||
let root = Path::new("/work");
|
||||
assert_eq!(
|
||||
server_command_paths(&servers, root, &s),
|
||||
[
|
||||
("java-analyzer".to_owned(), "/opt/java-analyzer/bin/java-analyzer".into()),
|
||||
("jdtls".to_owned(), root.join("bin/jdtls")),
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -190,6 +190,17 @@ impl SshManager {
|
||||
self.sessions.lock().remove(id);
|
||||
}
|
||||
|
||||
/// Closes the shared session of configuration `id` when nothing but this manager holds it
|
||||
/// right now (no terminal, tunnel or transfer in progress); returns whether it did.
|
||||
pub fn release(&self, id: &str) -> bool {
|
||||
let mut sessions = self.sessions.lock();
|
||||
let unused = sessions.get(id).is_some_and(|s| Arc::strong_count(s) == 1);
|
||||
if unused {
|
||||
sessions.remove(id);
|
||||
}
|
||||
unused
|
||||
}
|
||||
|
||||
/// Ids of the configurations with an open session.
|
||||
pub fn connected(&self) -> Vec<String> {
|
||||
self.sessions.lock().iter().filter(|(_, s)| !s.is_closed()).map(|(k, _)| k.clone()).collect()
|
||||
|
||||
@@ -6,6 +6,7 @@ use crate::session::Session;
|
||||
use ide_core::{IdeError, IdeResult, error::ErrorKind};
|
||||
use std::sync::Arc;
|
||||
use tokio::net::TcpListener;
|
||||
use tokio::sync::Notify;
|
||||
use tokio::task::JoinHandle;
|
||||
|
||||
/// An open tunnel; dropping it stops forwarding (the session stays open while
|
||||
@@ -14,6 +15,7 @@ pub struct Tunnel {
|
||||
port: u16,
|
||||
session: Arc<Session>,
|
||||
accept: JoinHandle<()>,
|
||||
stop: Arc<Notify>,
|
||||
}
|
||||
|
||||
impl Tunnel {
|
||||
@@ -40,19 +42,21 @@ impl Tunnel {
|
||||
},
|
||||
None => TcpListener::bind(("127.0.0.1", 0)).await?,
|
||||
};
|
||||
let local = listener.local_addr()?.port();
|
||||
let target = Target::Tcp(host.to_owned(), port);
|
||||
let accept = tokio::spawn(forward(listener, session.clone(), target));
|
||||
Ok(Tunnel { port: local, session, accept })
|
||||
Self::spawn(listener, session, Target::Tcp(host.to_owned(), port))
|
||||
}
|
||||
|
||||
/// Listens on a free local port; each connection runs `command` on the SSH host and talks
|
||||
/// to its stdin / stdout (`docker system dial-stdio`, as the Docker CLI's `ssh://` does).
|
||||
pub async fn command(session: Arc<Session>, command: &str) -> IdeResult<Tunnel> {
|
||||
let listener = TcpListener::bind(("127.0.0.1", 0)).await?;
|
||||
let local = listener.local_addr()?.port();
|
||||
let accept = tokio::spawn(forward(listener, session.clone(), Target::Command(command.to_owned())));
|
||||
Ok(Tunnel { port: local, session, accept })
|
||||
Self::spawn(listener, session, Target::Command(command.to_owned()))
|
||||
}
|
||||
|
||||
fn spawn(listener: TcpListener, session: Arc<Session>, target: Target) -> IdeResult<Tunnel> {
|
||||
let port = listener.local_addr()?.port();
|
||||
let stop = Arc::new(Notify::new());
|
||||
let accept = tokio::spawn(forward(listener, session.clone(), target, stop.clone()));
|
||||
Ok(Tunnel { port, session, accept, stop })
|
||||
}
|
||||
|
||||
/// The local port to connect to instead of the target.
|
||||
@@ -63,6 +67,13 @@ impl Tunnel {
|
||||
pub fn is_closed(&self) -> bool {
|
||||
self.session.is_closed()
|
||||
}
|
||||
|
||||
/// Stops forwarding like dropping it does, but returns only once the listener and every
|
||||
/// forwarded connection are gone, so the session is no longer held by this tunnel.
|
||||
pub async fn close(mut self) {
|
||||
self.stop.notify_one();
|
||||
let _ = (&mut self.accept).await;
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Tunnel {
|
||||
@@ -77,12 +88,16 @@ enum Target {
|
||||
Command(String),
|
||||
}
|
||||
|
||||
async fn forward(listener: TcpListener, session: Arc<Session>, target: Target) {
|
||||
async fn forward(listener: TcpListener, session: Arc<Session>, target: Target, stop: Arc<Notify>) {
|
||||
let target = Arc::new(target);
|
||||
let mut connections = tokio::task::JoinSet::new();
|
||||
loop {
|
||||
let accepted = tokio::select! {
|
||||
Some(_) = connections.join_next(), if !connections.is_empty() => continue,
|
||||
() = stop.notified() => {
|
||||
connections.shutdown().await;
|
||||
return;
|
||||
}
|
||||
accepted = listener.accept() => accepted,
|
||||
};
|
||||
let Ok((mut socket, _)) = accepted else { return };
|
||||
|
||||
@@ -272,6 +272,36 @@ async fn dropping_a_tunnel_closes_active_connections() {
|
||||
assert!(!session.is_closed());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn closing_a_tunnel_lets_go_of_the_session_and_its_connections() {
|
||||
let env = env().await;
|
||||
let session = Arc::new(env.connect_trusted(&env.target(SshAuth::Password), Some("secret")).await.ok().unwrap());
|
||||
let tunnel = Tunnel::listen(session.clone(), "127.0.0.1", env.echo_port).await.unwrap();
|
||||
let port = tunnel.port();
|
||||
let mut socket = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
|
||||
socket.write_all(b"ping").await.unwrap();
|
||||
let mut reply = [0; 4];
|
||||
socket.read_exact(&mut reply).await.unwrap();
|
||||
assert!(Arc::strong_count(&session) > 2, "the tunnel and its connection hold the session");
|
||||
|
||||
tunnel.close().await;
|
||||
// Nothing is left behind to wait for: only this test holds the session now.
|
||||
assert_eq!(Arc::strong_count(&session), 1);
|
||||
let mut byte = [0];
|
||||
assert_eq!(socket.read(&mut byte).await.unwrap(), 0);
|
||||
assert!(TcpStream::connect(("127.0.0.1", port)).await.is_err());
|
||||
assert!(!session.is_closed());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn closing_an_idle_tunnel_returns_at_once() {
|
||||
let env = env().await;
|
||||
let session = Arc::new(env.connect_trusted(&env.target(SshAuth::Password), Some("secret")).await.ok().unwrap());
|
||||
let tunnel = Tunnel::command(session.clone(), "docker system dial-stdio").await.unwrap();
|
||||
tokio::time::timeout(std::time::Duration::from_secs(5), tunnel.close()).await.unwrap();
|
||||
assert_eq!(Arc::strong_count(&session), 1);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn key_pair_authentication_with_and_without_passphrase() {
|
||||
let env = env().await;
|
||||
|
||||
@@ -222,6 +222,31 @@ mod tests {
|
||||
assert_eq!(select_asset(&names[5..8], rules, WIN), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn java_analyzer_assets() {
|
||||
let names = [
|
||||
"java-analyzer-macos-aarch64.gz",
|
||||
"java-analyzer-macos-x86_64.gz",
|
||||
"java-analyzer-linux-aarch64.gz",
|
||||
"java-analyzer-linux-x86_64.gz",
|
||||
"java-analyzer-windows-aarch64.zip",
|
||||
"java-analyzer-windows-x86_64.zip",
|
||||
"java-analyzer-macos-aarch64.gz.sha256",
|
||||
"java-analyzer-windows-x86_64.zip.sha256",
|
||||
];
|
||||
let rules = crate::registry::find("java-analyzer").unwrap().asset_rules();
|
||||
for (os, arch, expected) in [
|
||||
(Os::Mac, Arch::Arm64, names[0]),
|
||||
(Os::Mac, Arch::X64, names[1]),
|
||||
(Os::Linux, Arch::Arm64, names[2]),
|
||||
(Os::Linux, Arch::X64, names[3]),
|
||||
(Os::Windows, Arch::Arm64, names[4]),
|
||||
(Os::Windows, Arch::X64, names[5]),
|
||||
] {
|
||||
assert_eq!(select_asset(&names, rules, Platform { os, arch }), Some(expected));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rosetta_fallback_and_missing() {
|
||||
let names = ["zls-x86_64-macos.tar.xz", "zls-x86_64-linux.tar.xz", "zls-x86_64-windows.zip"];
|
||||
|
||||
@@ -793,6 +793,28 @@ pub static TOOLS: &[ToolSpec] = &[
|
||||
homepage: "https://github.com/eclipse-jdtls/eclipse.jdt.ls",
|
||||
needs: &[],
|
||||
},
|
||||
ToolSpec {
|
||||
name: "java-analyzer",
|
||||
display: "java-analyzer",
|
||||
kind: LanguageServer,
|
||||
commands: &["java-analyzer"],
|
||||
method: Method::Release {
|
||||
source: ReleaseSource::GitHub { repo: "l0ng-ai/java-analyzer" },
|
||||
assets: &[
|
||||
rule(Mac, Arm64, "java-analyzer-macos-aarch64.gz"),
|
||||
rule(Mac, X64, "java-analyzer-macos-x86_64.gz"),
|
||||
rule(Linux, Arm64, "java-analyzer-linux-aarch64.gz"),
|
||||
rule(Linux, X64, "java-analyzer-linux-x86_64.gz"),
|
||||
rule(Windows, Arm64, "java-analyzer-windows-aarch64.zip"),
|
||||
rule(Windows, X64, "java-analyzer-windows-x86_64.zip"),
|
||||
],
|
||||
locate: &["java-analyzer"],
|
||||
},
|
||||
fallback: None,
|
||||
version: ver("java-analyzer"),
|
||||
homepage: "https://github.com/l0ng-ai/java-analyzer",
|
||||
needs: &[],
|
||||
},
|
||||
ToolSpec {
|
||||
name: "kmp-lsp",
|
||||
display: "kmp-lsp",
|
||||
|
||||
@@ -193,8 +193,8 @@ fn interchangeable_servers_list_their_alternatives() {
|
||||
assert_eq!(find(&list, name).alternatives, python);
|
||||
}
|
||||
assert_eq!(find(&list, "vtsls").alternatives, ["vtsls", "typescript-language-server"]);
|
||||
for name in ["jdtls", "kmp-lsp"] {
|
||||
assert_eq!(find(&list, name).alternatives, ["jdtls", "kmp-lsp"]);
|
||||
for name in ["jdtls", "java-analyzer", "kmp-lsp"] {
|
||||
assert_eq!(find(&list, name).alternatives, ["jdtls", "java-analyzer", "kmp-lsp"]);
|
||||
assert_eq!(find(&list, name).languages, if name == "kmp-lsp" { &["Java", "Kotlin"][..] } else { &["Java"] });
|
||||
}
|
||||
for name in ["kotlin-lsp", "kotlin-language-server"] {
|
||||
|
||||
@@ -306,7 +306,7 @@ pub(crate) fn run_raw_env(
|
||||
env: &[(&str, &std::ffi::OsStr)],
|
||||
) -> IdeResult<Output> {
|
||||
let first = run_raw_env_once(root, args, stdin, env)?;
|
||||
if !retryable_index_lock(args, &first) {
|
||||
if !retryable_index_conflict(args, &first) {
|
||||
return Ok(first);
|
||||
}
|
||||
let deadline = Instant::now() + Duration::from_secs(2);
|
||||
@@ -320,13 +320,17 @@ pub(crate) fn run_raw_env(
|
||||
return Ok(first);
|
||||
}
|
||||
let out = run_raw_env_once(root, args, stdin, env)?;
|
||||
if !retryable_index_lock(args, &out) {
|
||||
if !retryable_index_conflict(args, &out) {
|
||||
return Ok(out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn retryable_index_lock(args: &[&str], out: &Output) -> bool {
|
||||
/// git reporting that it could not replace `.git/index`: on Windows the file cannot be
|
||||
/// renamed over while another process still has it open, which is no `index.lock` conflict.
|
||||
const INDEX_WRITE_BLOCKED: &str = "fatal: Could not write new index file.";
|
||||
|
||||
fn retryable_index_conflict(args: &[&str], out: &Output) -> bool {
|
||||
// These builtins take the index lock before changing the index, worktree or refs.
|
||||
// switch folds post-checkout hook failures to exit 1, unlike checkout/restore
|
||||
// path operations, whose hooks can return 128 after files have already changed.
|
||||
@@ -345,11 +349,24 @@ fn retryable_index_lock(args: &[&str], out: &Output) -> bool {
|
||||
return false;
|
||||
}
|
||||
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||
let Some(path) = stderr.lines().next().and_then(|line| line.strip_prefix("fatal: Unable to create '")) else {
|
||||
return false;
|
||||
};
|
||||
path.strip_suffix("': File exists.")
|
||||
.is_some_and(|path| path.ends_with("/index.lock") || path.ends_with("\\index.lock"))
|
||||
let Some(first) = stderr.lines().next() else { return false };
|
||||
if let Some(path) = first.strip_prefix("fatal: Unable to create '") {
|
||||
return path
|
||||
.strip_suffix("': File exists.")
|
||||
.is_some_and(|path| path.ends_with("/index.lock") || path.ends_with("\\index.lock"));
|
||||
}
|
||||
// `.git/index` keeps its previous entries when the new file could not replace it, so
|
||||
// rerunning is safe for the builtins that take the lock before changing anything.
|
||||
// switch may already have updated the worktree by then, and `rm` without `--cached`
|
||||
// has deleted the files before it writes the index.
|
||||
if first == INDEX_WRITE_BLOCKED {
|
||||
return match *sub {
|
||||
"switch" => false,
|
||||
"rm" => options.contains(&"--cached"),
|
||||
_ => true,
|
||||
};
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
fn run_raw_env_once(
|
||||
@@ -977,15 +994,15 @@ mod index_lock_tests {
|
||||
code: Some(128),
|
||||
};
|
||||
for args in [&["switch", "other"][..], &["--literal-pathspecs", "add", "-A", "--"], &["rm"], &["reset"]] {
|
||||
assert!(retryable_index_lock(args, &out));
|
||||
assert!(retryable_index_conflict(args, &out));
|
||||
}
|
||||
for sub in ["merge", "rebase", "stash", "commit", "update-index", "checkout", "restore", "pull", "status"] {
|
||||
assert!(!retryable_index_lock(&[sub], &out));
|
||||
assert!(!retryable_index_conflict(&[sub], &out));
|
||||
}
|
||||
assert!(!retryable_index_lock(&["add", "--patch"], &out));
|
||||
assert!(!retryable_index_lock(&["reset", "--soft"], &out));
|
||||
assert!(!retryable_index_conflict(&["add", "--patch"], &out));
|
||||
assert!(!retryable_index_conflict(&["reset", "--soft"], &out));
|
||||
out.code = Some(1); // switch's post-checkout hook can fail after the switch succeeded.
|
||||
assert!(!retryable_index_lock(&["switch"], &out));
|
||||
assert!(!retryable_index_conflict(&["switch"], &out));
|
||||
out.code = Some(128);
|
||||
for message in [
|
||||
"fatal: Unable to create '/repo/.git/HEAD.lock': File exists.",
|
||||
@@ -994,7 +1011,37 @@ mod index_lock_tests {
|
||||
"warning: partial work\nfatal: Unable to create '/repo/.git/index.lock': File exists.",
|
||||
] {
|
||||
out.stderr = message.as_bytes().to_vec();
|
||||
assert!(!retryable_index_lock(&["switch"], &out));
|
||||
assert!(!retryable_index_conflict(&["switch"], &out));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn retries_an_index_the_worktree_scan_keeps_open_on_windows() {
|
||||
// Windows cannot rename over `.git/index` while the IDE's own status scan has it
|
||||
// open: git then reports a write failure instead of an index.lock conflict.
|
||||
let mut out = Output { stdout: Vec::new(), stderr: INDEX_WRITE_BLOCKED.as_bytes().to_vec(), code: Some(128) };
|
||||
for args in [
|
||||
&["--literal-pathspecs", "reset", "-q", "HEAD", "--", "a.md"][..],
|
||||
&["--literal-pathspecs", "add", "-A", "--"],
|
||||
&["--literal-pathspecs", "rm", "--cached", "-r", "-q", "--ignore-unmatch", "--"],
|
||||
] {
|
||||
assert!(retryable_index_conflict(args, &out), "{args:?}");
|
||||
}
|
||||
// The worktree may already be updated by switch, and `rm` deletes its files before
|
||||
// it writes the index, so neither is repeated.
|
||||
out.code = Some(128);
|
||||
for args in [&["switch", "other"][..], &["rm"]] {
|
||||
assert!(!retryable_index_conflict(args, &out), "{args:?}");
|
||||
}
|
||||
for sub in ["commit", "merge", "rebase", "update-index", "restore"] {
|
||||
assert!(!retryable_index_conflict(&[sub], &out));
|
||||
}
|
||||
// The same failure with output on stdout is not this message alone; and a
|
||||
// different exit code is not git's fatal.
|
||||
out.stdout = b"partial".to_vec();
|
||||
assert!(!retryable_index_conflict(&["reset"], &out));
|
||||
out.stdout.clear();
|
||||
out.code = Some(1);
|
||||
assert!(!retryable_index_conflict(&["reset"], &out));
|
||||
}
|
||||
}
|
||||
@@ -259,6 +259,27 @@ pub struct Branch {
|
||||
pub commit: String,
|
||||
}
|
||||
|
||||
/// What Update Selected did to one local branch.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum BranchUpdateStatus {
|
||||
Updated,
|
||||
UpToDate,
|
||||
/// Diverged from its upstream: left as it is.
|
||||
NotFastForward,
|
||||
NoUpstream,
|
||||
Failed,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct BranchUpdate {
|
||||
pub branch: String,
|
||||
pub status: BranchUpdateStatus,
|
||||
/// Why it failed.
|
||||
pub message: Option<String>,
|
||||
}
|
||||
|
||||
/// Commit Options (IDEA's commit options popup).
|
||||
#[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
@@ -1458,11 +1479,16 @@ impl Repo {
|
||||
let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
|
||||
write::reset_to_upstream(self, cancel, on_output)
|
||||
}
|
||||
/// Fast-forwards a local branch that is not checked out to its upstream (Branches ›
|
||||
/// Update). Fails when the branch has diverged.
|
||||
pub fn update_branch(&self, branch: &str, cancel: &CancellationToken, on_output: &dyn Fn(String)) -> IdeResult<()> {
|
||||
/// Branches › Update Selected: fetches each remote once and fast-forwards every
|
||||
/// branch to its upstream, reporting the branches it could not update.
|
||||
pub fn update_branches(
|
||||
&self,
|
||||
branches: &[String],
|
||||
cancel: &CancellationToken,
|
||||
on_output: &dyn Fn(String),
|
||||
) -> IdeResult<Vec<BranchUpdate>> {
|
||||
let _scope = crate::ExecutionScope::enter(self.execution_allowed.load(std::sync::atomic::Ordering::Acquire));
|
||||
write::update_branch(self, branch, cancel, on_output)
|
||||
write::update_branches(self, branches, cancel, on_output)
|
||||
}
|
||||
// ---- in-progress operations, history rewriting, tags ----
|
||||
|
||||
|
||||
@@ -5,10 +5,11 @@ use crate::cli::{self, run};
|
||||
use crate::repo::{gx, resolve};
|
||||
use crate::text_encoding::{decode, encode, has_bom, is_binary};
|
||||
use crate::{
|
||||
BlameLine, CheckoutMode, CheckoutOptions, CheckoutOutcome, CommitOptions, DeletedBranch, DivergedLocal,
|
||||
PushBranchOptions, Repo,
|
||||
BlameLine, BranchUpdate, BranchUpdateStatus, CheckoutMode, CheckoutOptions, CheckoutOutcome, CommitOptions,
|
||||
DeletedBranch, DivergedLocal, PushBranchOptions, Repo,
|
||||
};
|
||||
use gix::bstr::{BStr, ByteSlice};
|
||||
use ide_core::error::ErrorKind;
|
||||
use ide_core::{CancellationToken, IdeError, IdeResult};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
@@ -1392,18 +1393,79 @@ pub(crate) fn push_branch(
|
||||
cli::run_streaming(r.root(), &argv, cancel, on_output)
|
||||
}
|
||||
|
||||
/// Fast-forwards local `branch` (not checked out) to its upstream, fetching it first.
|
||||
pub(crate) fn update_branch(
|
||||
/// Update Selected (IDEA's Git.Update.Selected): fetches the remote of each branch once,
|
||||
/// then fast-forwards the branch to its tracked branch: the checked-out one with
|
||||
/// `merge --ff-only`, the others with a local fetch, which refuses branches checked out
|
||||
/// in another worktree. Diverged branches are left alone.
|
||||
pub(crate) fn update_branches(
|
||||
r: &Repo,
|
||||
branch: &str,
|
||||
branches: &[String],
|
||||
cancel: &CancellationToken,
|
||||
on_output: &dyn Fn(String),
|
||||
) -> IdeResult<()> {
|
||||
check_local_branch(r, branch)?;
|
||||
let (remote, name) =
|
||||
branch_upstream(r, branch).ok_or_else(|| IdeError::invalid(format!("'{branch}' has no tracked branch")))?;
|
||||
let refspec = format!("refs/heads/{name}:refs/heads/{branch}");
|
||||
cli::run_streaming(r.root(), &["fetch", "--progress", &remote, &refspec], cancel, on_output)
|
||||
) -> IdeResult<Vec<BranchUpdate>> {
|
||||
let head =
|
||||
run(r.root(), &["symbolic-ref", "-q", "--short", "HEAD"], None).ok().map(|o| o.stdout_str().trim().to_string());
|
||||
let mut fetched: Vec<(String, Result<(), String>)> = Vec::new();
|
||||
let mut out = Vec::with_capacity(branches.len());
|
||||
for branch in branches {
|
||||
check_local_branch(r, branch)?;
|
||||
let result = |status, message| BranchUpdate { branch: branch.clone(), status, message };
|
||||
let Some((remote, _)) = branch_upstream(r, branch) else {
|
||||
out.push(result(BranchUpdateStatus::NoUpstream, None));
|
||||
continue;
|
||||
};
|
||||
let fetch = match fetched.iter().find(|(name, _)| *name == remote) {
|
||||
Some((_, done)) => done.clone(),
|
||||
None => {
|
||||
let done = match cli::run_streaming(r.root(), &["fetch", "--progress", &remote], cancel, on_output) {
|
||||
Err(e) if e.kind == ErrorKind::Cancelled => return Err(e),
|
||||
done => done.map_err(|e| e.message),
|
||||
};
|
||||
fetched.push((remote, done.clone()));
|
||||
done
|
||||
}
|
||||
};
|
||||
let (status, message) = match fetch {
|
||||
Err(message) => (BranchUpdateStatus::Failed, Some(message)),
|
||||
Ok(()) => fast_forward(r, branch, head.as_deref() == Some(branch.as_str()), cancel, on_output)?,
|
||||
};
|
||||
out.push(result(status, message));
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn fast_forward(
|
||||
r: &Repo,
|
||||
branch: &str,
|
||||
current: bool,
|
||||
cancel: &CancellationToken,
|
||||
on_output: &dyn Fn(String),
|
||||
) -> IdeResult<(BranchUpdateStatus, Option<String>)> {
|
||||
let rev = |args: &[&str]| run(r.root(), args, None).ok().map(|o| o.stdout_str().trim().to_string());
|
||||
let ancestor = |a: &str, b: &str| {
|
||||
cli::run_raw(r.root(), &["merge-base", "--is-ancestor", a, b], None).is_ok_and(|o| o.code == Some(0))
|
||||
};
|
||||
let local = format!("refs/heads/{branch}");
|
||||
let tracked =
|
||||
rev(&["rev-parse", "--symbolic-full-name", &format!("{branch}@{{upstream}}")]).filter(|t| !t.is_empty());
|
||||
let target = tracked.as_deref().and_then(|t| rev(&["rev-parse", "-q", "--verify", &format!("{t}^{{commit}}")]));
|
||||
let (Some(tracked), Some(target), Some(tip)) = (tracked, target, rev(&["rev-parse", "-q", "--verify", &local]))
|
||||
else {
|
||||
return Ok((BranchUpdateStatus::Failed, Some(format!("the tracked branch of '{branch}' was not found"))));
|
||||
};
|
||||
if tip == target || ancestor(&target, &tip) {
|
||||
return Ok((BranchUpdateStatus::UpToDate, None));
|
||||
}
|
||||
if !ancestor(&tip, &target) {
|
||||
return Ok((BranchUpdateStatus::NotFastForward, None));
|
||||
}
|
||||
let refspec = format!("{tracked}:{local}");
|
||||
let args: &[&str] = if current { &["merge", "--ff-only", &tracked] } else { &["fetch", ".", &refspec] };
|
||||
match cli::run_streaming(r.root(), args, cancel, on_output) {
|
||||
Ok(()) => Ok((BranchUpdateStatus::Updated, None)),
|
||||
Err(e) if e.kind == ErrorKind::Cancelled => Err(e),
|
||||
Err(e) => Ok((BranchUpdateStatus::Failed, Some(e.message))),
|
||||
}
|
||||
}
|
||||
|
||||
/// Update Project › Reset to the Remote Branch: fetches the current branch's tracked
|
||||
|
||||
@@ -560,7 +560,7 @@ fn push_branch_and_up_to_revision() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_branch_fast_forwards_a_branch_not_checked_out() {
|
||||
fn update_branches_fast_forwards_each_selected_branch() {
|
||||
let fx = Fixture::new();
|
||||
let bare = fx._tmp.path().join("origin.git");
|
||||
git_in(fx._tmp.path(), &["init", "-q", "--bare", bare.to_str().unwrap()]);
|
||||
@@ -568,22 +568,104 @@ fn update_branch_fast_forwards_a_branch_not_checked_out() {
|
||||
fx.commit_all("one");
|
||||
fx.git(&["remote", "add", "origin", bare.to_str().unwrap()]);
|
||||
fx.git(&["push", "-q", "-u", "origin", "main"]);
|
||||
fx.git(&["checkout", "-q", "-b", "work"]);
|
||||
// Someone else advances origin/main.
|
||||
for b in ["behind", "diverged", "ahead", "same", "elsewhere"] {
|
||||
fx.git(&["push", "-q", "origin", &format!("main:{b}")]);
|
||||
fx.git(&["branch", "-q", "--track", b, &format!("origin/{b}")]);
|
||||
}
|
||||
fx.git(&["branch", "-q", "local-only"]);
|
||||
// Someone else advances main, behind, diverged and elsewhere on the remote.
|
||||
let other = fx._tmp.path().join("other");
|
||||
git_in(fx._tmp.path(), &["clone", "-q", bare.to_str().unwrap(), other.to_str().unwrap()]);
|
||||
std::fs::write(other.join("a.txt"), "2\n").unwrap();
|
||||
git_in(&other, &["-c", "user.name=O", "-c", "user.email=o@x", "commit", "-q", "-am", "two"]);
|
||||
git_in(&other, &["push", "-q", "origin", "main"]);
|
||||
let tip = git_in(&other, &["rev-parse", "HEAD"]);
|
||||
let mut tips = std::collections::HashMap::new();
|
||||
for b in ["main", "behind", "diverged", "elsewhere"] {
|
||||
git_in(&other, &["checkout", "-q", b]);
|
||||
std::fs::write(other.join("a.txt"), format!("{b}\n")).unwrap();
|
||||
git_in(&other, &["-c", "user.name=O", "-c", "user.email=o@x", "commit", "-q", "-am", b]);
|
||||
git_in(&other, &["push", "-q", "origin", b]);
|
||||
tips.insert(b, git_in(&other, &["rev-parse", "HEAD"]));
|
||||
}
|
||||
// Local commits: `diverged` can't be fast-forwarded, `ahead` has nothing to take.
|
||||
for b in ["diverged", "ahead"] {
|
||||
fx.git(&["checkout", "-q", b]);
|
||||
fx.write("b.txt", b);
|
||||
fx.commit_all(b);
|
||||
}
|
||||
fx.git(&["checkout", "-q", "main"]);
|
||||
// A branch checked out in another worktree is refused rather than moved under it.
|
||||
let wt = fx._tmp.path().join("wt");
|
||||
fx.git(&["worktree", "add", "-q", wt.to_str().unwrap(), "elsewhere"]);
|
||||
let ahead = fx.git(&["rev-parse", "ahead"]);
|
||||
|
||||
let repo = fx.repo();
|
||||
let (cancel, out) = quiet();
|
||||
repo.update_branch("main", &cancel, &out).unwrap();
|
||||
assert_eq!(fx.git(&["rev-parse", "main"]), tip);
|
||||
assert_eq!(fx.git(&["rev-parse", "origin/main"]), tip);
|
||||
// The checked-out branch and branches without upstream are refused.
|
||||
assert!(repo.update_branch("work", &cancel, &out).is_err());
|
||||
let names = ["main", "behind", "diverged", "ahead", "same", "local-only", "elsewhere"].map(String::from);
|
||||
let result = repo.update_branches(&names, &cancel, &out).unwrap();
|
||||
let status: Vec<_> = result.iter().map(|u| (u.branch.as_str(), u.status)).collect();
|
||||
use BranchUpdateStatus::*;
|
||||
assert_eq!(
|
||||
status,
|
||||
[
|
||||
("main", Updated),
|
||||
("behind", Updated),
|
||||
("diverged", NotFastForward),
|
||||
("ahead", UpToDate),
|
||||
("same", UpToDate),
|
||||
("local-only", NoUpstream),
|
||||
("elsewhere", Failed),
|
||||
]
|
||||
);
|
||||
assert!(result[6].message.as_deref().is_some_and(|m| m.contains("checked out")), "{:?}", result[6].message);
|
||||
// The checked-out branch is fast-forwarded with its working tree.
|
||||
assert_eq!(fx.git(&["rev-parse", "main"]), tips["main"]);
|
||||
assert_eq!(fx.read("a.txt"), "main\n");
|
||||
assert_eq!(fx.git(&["rev-parse", "behind"]), tips["behind"]);
|
||||
assert_eq!(fx.git(&["rev-parse", "origin/diverged"]), tips["diverged"]);
|
||||
assert_ne!(fx.git(&["rev-parse", "diverged"]), tips["diverged"]);
|
||||
assert_eq!(fx.git(&["rev-parse", "ahead"]), ahead);
|
||||
assert_ne!(fx.git(&["rev-parse", "elsewhere"]), tips["elsewhere"]);
|
||||
assert!(repo.update_branches(&["origin/main".into()], &cancel, &out).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_branches_fetches_each_remote_once_and_reports_its_failure() {
|
||||
let fx = Fixture::new();
|
||||
let bare = fx._tmp.path().join("origin.git");
|
||||
git_in(fx._tmp.path(), &["init", "-q", "--bare", bare.to_str().unwrap()]);
|
||||
fx.write("a.txt", "1\n");
|
||||
fx.commit_all("one");
|
||||
fx.git(&["remote", "add", "origin", bare.to_str().unwrap()]);
|
||||
fx.git(&["remote", "add", "gone", fx._tmp.path().join("missing.git").to_str().unwrap()]);
|
||||
fx.git(&["push", "-q", "-u", "origin", "main", "main:a", "main:b"]);
|
||||
for b in ["a", "b"] {
|
||||
fx.git(&["branch", "-q", "--track", b, &format!("origin/{b}")]);
|
||||
}
|
||||
fx.git(&["branch", "-q", "c"]);
|
||||
fx.git(&["config", "branch.c.remote", "gone"]);
|
||||
fx.git(&["config", "branch.c.merge", "refs/heads/c"]);
|
||||
|
||||
// Counts the fetches from origin.
|
||||
#[cfg(unix)]
|
||||
let counter = {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
let counter = fx._tmp.path().join("fetches");
|
||||
let script = fx._tmp.path().join("upload-pack.sh");
|
||||
std::fs::write(&script, format!("#!/bin/sh\necho >> '{}'\nexec git-upload-pack \"$@\"\n", counter.display()))
|
||||
.unwrap();
|
||||
std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||
fx.git(&["config", "remote.origin.uploadpack", script.to_str().unwrap()]);
|
||||
counter
|
||||
};
|
||||
|
||||
let repo = fx.repo();
|
||||
let (cancel, out) = quiet();
|
||||
let names = ["a", "b", "c"].map(String::from);
|
||||
let result = repo.update_branches(&names, &cancel, &out).unwrap();
|
||||
let status: Vec<_> = result.iter().map(|u| u.status).collect();
|
||||
use BranchUpdateStatus::*;
|
||||
assert_eq!(status, [UpToDate, UpToDate, Failed]);
|
||||
assert!(result[2].message.is_some());
|
||||
#[cfg(unix)]
|
||||
assert_eq!(std::fs::read_to_string(counter).unwrap().lines().count(), 1);
|
||||
}
|
||||
|
||||
/// `"` and tabs are illegal in Windows file names, and only they make Git quote a path.
|
||||
|
||||
@@ -366,7 +366,7 @@ const HTML: &str = "text/html; charset=utf-8";
|
||||
fn content_type(path: &Path) -> &'static str {
|
||||
let ext = path.extension().map(|e| e.to_string_lossy().to_ascii_lowercase()).unwrap_or_default();
|
||||
match ext.as_str() {
|
||||
"html" | "htm" | "xhtml" => HTML,
|
||||
"html" | "htm" | "xhtml" | "shtml" => HTML,
|
||||
"css" => "text/css; charset=utf-8",
|
||||
"js" | "mjs" | "cjs" => "text/javascript; charset=utf-8",
|
||||
"json" | "map" | "webmanifest" => "application/json; charset=utf-8",
|
||||
@@ -415,6 +415,11 @@ mod tests {
|
||||
out
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shtml_files_are_html_by_name() {
|
||||
assert_eq!(content_type(Path::new("page.SHTML")), HTML);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_page_is_html_whatever_its_name() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -170,8 +170,8 @@ Each launch opens a tab in the **Run** tool window (bottom). The toolbar has **R
|
||||
|
||||
Two actions in Find Action (also linked from the dialog) import existing configurations:
|
||||
|
||||
- **Import Run Configurations from .vscode/launch.json**: Python and Node.js launches and attaches, plus compounds. Fixed variables such as `${workspaceFolder}` and `${env:NAME}` are replaced; entries that use `${file}`, `${input:…}` or `${command:…}` are skipped.
|
||||
- **Import Run Configurations from JetBrains (.run, .idea)**: reads `.run/*.run.xml`, `.idea/runConfigurations/*.xml` and `.idea/workspace.xml`. Python, Django, pytest, npm, Jest, Vitest, Node.js, Shell Script, Application, JAR Application, Spring Boot, Go and compound configurations are converted; other types are skipped.
|
||||
- **Import Run Configurations from .vscode/launch.json**: Python and Node.js launches and attaches, Dart launches (Flutter apps as Flutter configurations), plus compounds. Fixed variables such as `${workspaceFolder}` and `${env:NAME}` are replaced; entries that use `${file}`, `${input:…}` or `${command:…}` are skipped.
|
||||
- **Import Run Configurations from JetBrains (.run, .idea)**: reads `.run/*.run.xml`, `.idea/runConfigurations/*.xml` and `.idea/workspace.xml`. Python, Django, pytest, npm, Jest, Vitest, Node.js, Shell Script, Application, JAR Application, Spring Boot, Go, Flutter and compound configurations are converted; other types are skipped. An entry that runs the same command as an existing configuration, such as the detected `flutter run`, is skipped.
|
||||
|
||||
A notification says how many were imported and why others were left out.
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@ The **Log** tab of the Git tool window shows the commit graph.
|
||||
- **Go to Hash/Branch/Tag** (`⌘F` / `Ctrl+F` in the log).
|
||||
- **Graph Options**: sort by date, topologically or incoming first; first parent only; no merges.
|
||||
- **View Options**: reference display, details pane, and columns (**Author**, **Date**, **Hash**, **Signature**, **GitHub Commit Checks**).
|
||||
- The branches pane on the left filters the log by branch and has branch actions.
|
||||
- The branches pane on the left filters the log by branch and has branch actions. Select several local branches and choose **Update Selected** to fast-forward each to its tracked branch, fetching each remote once; one notification lists the branches that were updated and those that could not be fast-forwarded or have no tracked branch.
|
||||
- The details pane shows the changed files, the commit message, who committed it, which branches contain it and its signature.
|
||||
|
||||
Right-click a commit for **Copy Revision Number** (`⌥⇧⌘C` / `Ctrl+Alt+Shift+C`), **Create Patch…**, **Cherry-Pick**, **Checkout Revision**, **Browse Repository at Revision**, **Compare with Local**, **Reset Current Branch to Here…**, **Revert Commit**, **Undo Commit…**, **New Branch…**, **New Tag…**, **View in Browser** and more. With two commits selected, **Compare Versions** diffs them.
|
||||
|
||||
@@ -37,13 +37,15 @@ After editing the file, run **Reload .ideavimrc** (from the status bar widget or
|
||||
|
||||
Supported lines:
|
||||
|
||||
| Line | Notes |
|
||||
| --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| `map`, `noremap` and their `n`, `v`, `x`, `i`, `o` variants (`nnoremap`, `vmap`…) | `<silent>`, `<unique>`, `<nowait>`, `<buffer>`, `<expr>` and `<script>` flags are accepted and ignored. Key names such as `<esc>` and `<CR>` are case-insensitive. |
|
||||
| `let mapleader = "…"` | Also `g:mapleader`. `"\<Space>"` and `" "` both mean Space. The default leader is `\`. |
|
||||
| `set …` | Only the options codemirror-vim implements: `textwidth` (`tw`), `pcre`, `insertModeEscKeysTimeout` and `langmap` (`lmap`). Other options are reported as ignored. |
|
||||
| `source <file>` | Reads another file by the same rules. `~` is your home directory. |
|
||||
| `" comment` | Ignored. |
|
||||
| Line | Notes |
|
||||
| --------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `map`, `noremap` and their `n`, `v`, `x`, `i`, `o` variants (`nnoremap`, `vmap`…) | `<silent>`, `<unique>`, `<nowait>`, `<buffer>`, `<expr>` and `<script>` flags are accepted and ignored. Key names such as `<esc>` and `<CR>` are case-insensitive. |
|
||||
| `let mapleader = "…"` | Also `g:mapleader`. `"\<Space>"` and `" "` both mean Space. The default leader is `\`. |
|
||||
| `set …` | `textwidth` (`tw`), `pcre`, `insertModeEscKeysTimeout`, `langmap` (`lmap`) and `clipboard` (`cb`). `+=`, `-=` and `^=` work as in Vim. Other options are reported as ignored. |
|
||||
| `source <file>` | Reads another file by the same rules. `~` is your home directory. |
|
||||
| `" comment` | Ignored. |
|
||||
|
||||
`set clipboard+=unnamedplus` (or `unnamed`) also copies yanks, deletes and changes without a register to the system clipboard. The `"+` register always reads and writes the system clipboard.
|
||||
|
||||
Anything else (functions, `if`, `autocmd`, plugin commands) is reported as ignored and never executed.
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ The table lists every built-in language definition. Server and debugger names in
|
||||
| HTTP Request | `http` | `.http`, `.rest` | Yes | — | — | — |
|
||||
| Ignore File | `ignore` | `.gitignore`, `.dockerignore` | — | — | — | — |
|
||||
| INI | `ini` | `.ini`, `.cfg`, `.conf`, `.cnf`, `.inf`, … | Yes | — | — | — |
|
||||
| Java | `java` | `.java` | Yes | Yes | **jdtls** → **kmp-lsp** | **java-debug** |
|
||||
| Java | `java` | `.java` | Yes | Yes | **jdtls** → **java-analyzer** → **kmp-lsp** | **java-debug** |
|
||||
| JavaScript | `javascript` | `.js`, `.mjs`, `.cjs` | Yes | Yes | **vtsls** → **typescript-language-server** + **oxlint** | **js-debug** |
|
||||
| JavaScript JSX | `javascriptreact` | `.jsx` | Yes | Yes | **vtsls** → **typescript-language-server** + **oxlint** | **js-debug** |
|
||||
| JSON | `json` | `.json`, `.geojson`, `.topojson`, `.webmanifest`, `.har`, … | Yes | Yes | **vscode-json-language-server** | — |
|
||||
|
||||
@@ -7,15 +7,17 @@ Java code insight comes from the Eclipse JDT Language Server (jdtls), extended w
|
||||
|
||||
## Language servers
|
||||
|
||||
| Language | Server | Fallback | Debugger |
|
||||
| ---------------------- | ----------------------------------------- | ------------------------------------------------------------------ | --------------------------------------- |
|
||||
| Java | Eclipse JDT Language Server (`jdtls`) | `kmp-lsp` | Microsoft java-debug, loaded into jdtls |
|
||||
| Kotlin | Kotlin LSP (JetBrains, `kotlin-lsp`) | Kotlin Language Server (fwcd, `kotlin-language-server`), `kmp-lsp` | Kotlin Debug Adapter (fwcd) |
|
||||
| Groovy, Gradle scripts | `groovy-language-server` (you provide it) | | |
|
||||
| JSP | none (highlighting only) | | |
|
||||
| Language | Server | Fallback | Debugger |
|
||||
| ---------------------- | ----------------------------------------- | ------------------------------------------------------------------ | ------------------------------------------------------------------------------- |
|
||||
| Java | Eclipse JDT Language Server (`jdtls`) | `java-analyzer`, `kmp-lsp` | Microsoft java-debug, loaded into jdtls; `java-analyzer dap` with java-analyzer |
|
||||
| Kotlin | Kotlin LSP (JetBrains, `kotlin-lsp`) | Kotlin Language Server (fwcd, `kotlin-language-server`), `kmp-lsp` | Kotlin Debug Adapter (fwcd) |
|
||||
| Groovy, Gradle scripts | `groovy-language-server` (you provide it) | | |
|
||||
| JSP | none (highlighting only) | | |
|
||||
|
||||
A fallback starts only while the server listed before it is not installed. To pick one explicitly, open **Settings › Languages & Frameworks › Language Servers**, select either server and use **Language server for Java** (or Kotlin): **Automatic** uses the first one available, **None** turns code insight off. The choice can be global or for the current project.
|
||||
|
||||
`java-analyzer` is a native Java language server that needs no JVM to run. It imports Maven and Gradle projects itself (or a `java-analyzer.toml`), and also serves Run and Debug: Application configurations take their classpath from it, and debugging uses its own adapter (`java-analyzer dap`). OpenIDEA passes it the project JDK and the Maven local repository when they are set; otherwise it finds them itself.
|
||||
|
||||
`kmp-lsp` gives syntax-based Java code insight without running a JVM. It has no JDT compiler analysis, no Lombok support and none of the JDT refactorings. Building and running Java Application configurations, classpath discovery and the Java debugger need jdtls.
|
||||
|
||||
### What ships with the IDE
|
||||
@@ -43,6 +45,7 @@ When you open a Java or Kotlin file and its server is missing, a notification of
|
||||
| Kotlin LSP (JetBrains) | GitHub release of `Kotlin/kotlin-lsp` |
|
||||
| Kotlin Language Server (fwcd) | GitHub release of `fwcd/kotlin-language-server`; needs Java |
|
||||
| Kotlin Debug Adapter | GitHub release of `fwcd/kotlin-debug-adapter`; needs Java |
|
||||
| java-analyzer | GitHub release of `l0ng-ai/java-analyzer` |
|
||||
| kmp-lsp | GitHub release of `Hessesian/kmp-lsp` |
|
||||
|
||||
A `jdtls` already on your `PATH` (Homebrew, Scoop or a release archive) is used too. OpenIDEA starts it on the JVM directly instead of through its Python launcher script, so Python is not required. When you start a debug session without java-debug, the IDE offers to install it and restarts jdtls with the bundle.
|
||||
@@ -140,7 +143,7 @@ Navigation between MyBatis mapper interfaces and their XML statements is availab
|
||||
## Limitations
|
||||
|
||||
- One jdtls runs per project window. With several large projects open at once, memory adds up. Lower `-Xmx` in **JVM options** or close windows you are not using. **Share JDT LS across builds** helps only within one window.
|
||||
- Without jdtls (for example with `kmp-lsp` only), Application configurations, classpath-based features and Java debugging are not available.
|
||||
- With `kmp-lsp` only (no jdtls or java-analyzer), Application configurations, classpath-based features and Java debugging are not available.
|
||||
- Java tests run through Maven or Gradle. A project without either build tool has no test runner.
|
||||
- The jdtls compiler (ECJ) is stricter than javac in some places. Known case: a generic method call used directly as an `if`, `while`, `for` or `do` condition or a ternary condition — for example `if (getCacheObject(key))` with a `<T> T getCacheObject(String key)` method — compiles with javac but ECJ reports `Type mismatch: cannot convert from Object to boolean`. Assigning the call to a `boolean` variable first compiles on both (see [#2624](https://github.com/l0ng-ai/openidea/issues/2624)).
|
||||
- The Kotlin bridge is Maven only and exposes compiled Kotlin classes to Java. It does not give Java-to-Kotlin source navigation or refactoring.
|
||||
|
||||
@@ -166,8 +166,8 @@ Maven 模块在 **自动** 和 **构建(Make)** 时由 jdtls(ECJ)构建
|
||||
|
||||
“查找操作”里有两个导入操作(对话框里也有入口):
|
||||
|
||||
- **从 .vscode/launch.json 导入运行配置**:导入 Python 和 Node.js 的 launch / attach 配置以及 compounds。`${workspaceFolder}`、`${env:NAME}` 这类含义固定的变量会被替换;用到 `${file}`、`${input:…}`、`${command:…}` 的条目会被跳过。
|
||||
- **从 JetBrains 导入运行配置(.run、.idea)**:读取 `.run/*.run.xml`、`.idea/runConfigurations/*.xml` 和 `.idea/workspace.xml`。Python、Django、pytest、npm、Jest、Vitest、Node.js、Shell Script、Application、JAR Application、Spring Boot、Go 和复合配置会被转换,其他类型跳过。
|
||||
- **从 .vscode/launch.json 导入运行配置**:导入 Python 和 Node.js 的 launch / attach 配置、Dart 的 launch 配置(Flutter 应用导入为 Flutter 配置)以及 compounds。`${workspaceFolder}`、`${env:NAME}` 这类含义固定的变量会被替换;用到 `${file}`、`${input:…}`、`${command:…}` 的条目会被跳过。
|
||||
- **从 JetBrains 导入运行配置(.run、.idea)**:读取 `.run/*.run.xml`、`.idea/runConfigurations/*.xml` 和 `.idea/workspace.xml`。Python、Django、pytest、npm、Jest、Vitest、Node.js、Shell Script、Application、JAR Application、Spring Boot、Go、Flutter 和复合配置会被转换,其他类型跳过。和已有配置(例如自动检测出的 `flutter run`)命令相同的条目会被跳过。
|
||||
|
||||
导入完成后会有通知告诉你导入了多少、哪些被跳过以及原因。
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ Git 工具窗口的 **日志** 标签页显示提交图。
|
||||
- **转到哈希/分支/标签**(在日志中按 `⌘F` / `Ctrl+F`)。
|
||||
- **图形选项**:按日期、拓扑或传入优先排序;仅第一父提交;不显示合并提交。
|
||||
- **视图选项**:引用显示方式、详情面板,以及列(**作者**、**日期**、**哈希**、**签名**、**GitHub 提交检查**)。
|
||||
- 左侧的分支面板可以按分支过滤日志,并提供分支操作。
|
||||
- 左侧的分支面板可以按分支过滤日志,并提供分支操作。选中多个本地分支后选择 **Update Selected**,会把每个分支快进到它的跟踪分支,每个远程只 fetch 一次;结果汇总在一条通知里,列出已更新的分支,以及因不能快进或没有跟踪分支而未更新的分支。
|
||||
- 详情面板显示变更文件、提交消息、提交者、包含该提交的分支以及签名。
|
||||
|
||||
右键提交可以选择 **复制修订号**(`⌥⇧⌘C` / `Ctrl+Alt+Shift+C`)、**创建补丁…**、**拣选**、**签出修订**、**浏览此修订版本的仓库**、**与本地比较**、**将当前分支重置到此处…**、**还原提交**、**撤消提交…**、**新建分支…**、**新建标签…**、**在浏览器中查看** 等。选中两个提交时,**比较版本** 会比较它们。
|
||||
|
||||
@@ -37,13 +37,15 @@ Vim 模式开启时(如果上次是开启状态,启动时也会),OpenIDE
|
||||
|
||||
支持的写法:
|
||||
|
||||
| 写法 | 说明 |
|
||||
| ------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `map`、`noremap` 以及它们的 `n`、`v`、`x`、`i`、`o` 变体(`nnoremap`、`vmap`…) | `<silent>`、`<unique>`、`<nowait>`、`<buffer>`、`<expr>`、`<script>` 标志可以写,但会被忽略。`<esc>`、`<CR>` 等键名不区分大小写。 |
|
||||
| `let mapleader = "…"` | 也可以写 `g:mapleader`。`"\<Space>"` 和 `" "` 都表示空格。默认 leader 是 `\`。 |
|
||||
| `set …` | 只支持 codemirror-vim 实现的选项:`textwidth`(`tw`)、`pcre`、`insertModeEscKeysTimeout` 和 `langmap`(`lmap`)。其他选项会被标记为已忽略。 |
|
||||
| `source <file>` | 按同样的规则读取另一个文件,`~` 表示主目录。 |
|
||||
| `" 注释` | 忽略。 |
|
||||
| 写法 | 说明 |
|
||||
| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| `map`、`noremap` 以及它们的 `n`、`v`、`x`、`i`、`o` 变体(`nnoremap`、`vmap`…) | `<silent>`、`<unique>`、`<nowait>`、`<buffer>`、`<expr>`、`<script>` 标志可以写,但会被忽略。`<esc>`、`<CR>` 等键名不区分大小写。 |
|
||||
| `let mapleader = "…"` | 也可以写 `g:mapleader`。`"\<Space>"` 和 `" "` 都表示空格。默认 leader 是 `\`。 |
|
||||
| `set …` | `textwidth`(`tw`)、`pcre`、`insertModeEscKeysTimeout`、`langmap`(`lmap`)和 `clipboard`(`cb`)。`+=`、`-=`、`^=` 与 Vim 相同。其他选项会被标记为已忽略。 |
|
||||
| `source <file>` | 按同样的规则读取另一个文件,`~` 表示主目录。 |
|
||||
| `" 注释` | 忽略。 |
|
||||
|
||||
`set clipboard+=unnamedplus`(或 `unnamed`)让不指定寄存器的复制、删除和修改也写入系统剪贴板。`"+` 寄存器始终读写系统剪贴板。
|
||||
|
||||
其他内容(函数、`if`、`autocmd`、插件命令等)都会被标记为已忽略,不会执行。
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ IDE 安装工具从不需要 `sudo`。工具装在本地数据目录下 IDE 自
|
||||
| HTTP Request | `http` | `.http`, `.rest` | 是 | — | — | — |
|
||||
| Ignore File | `ignore` | `.gitignore`, `.dockerignore` | — | — | — | — |
|
||||
| INI | `ini` | `.ini`, `.cfg`, `.conf`, `.cnf`, `.inf`, … | 是 | — | — | — |
|
||||
| Java | `java` | `.java` | 是 | 是 | **jdtls** → **kmp-lsp** | **java-debug** |
|
||||
| Java | `java` | `.java` | 是 | 是 | **jdtls** → **java-analyzer** → **kmp-lsp** | **java-debug** |
|
||||
| JavaScript | `javascript` | `.js`, `.mjs`, `.cjs` | 是 | 是 | **vtsls** → **typescript-language-server** + **oxlint** | **js-debug** |
|
||||
| JavaScript JSX | `javascriptreact` | `.jsx` | 是 | 是 | **vtsls** → **typescript-language-server** + **oxlint** | **js-debug** |
|
||||
| JSON | `json` | `.json`, `.geojson`, `.topojson`, `.webmanifest`, `.har`, … | 是 | 是 | **vscode-json-language-server** | — |
|
||||
|
||||
@@ -7,15 +7,17 @@ Java 的代码智能由 Eclipse JDT Language Server(jdtls)提供,OpenIDEA
|
||||
|
||||
## 语言服务器
|
||||
|
||||
| 语言 | 服务器 | 备选 | 调试器 |
|
||||
| ------------------- | -------------------------------------- | ------------------------------------------------------------------- | ------------------------------------- |
|
||||
| Java | Eclipse JDT Language Server(`jdtls`) | `kmp-lsp` | Microsoft java-debug,加载在 jdtls 内 |
|
||||
| Kotlin | Kotlin LSP(JetBrains,`kotlin-lsp`) | Kotlin Language Server(fwcd,`kotlin-language-server`)、`kmp-lsp` | Kotlin Debug Adapter(fwcd) |
|
||||
| Groovy、Gradle 脚本 | `groovy-language-server`(需自行提供) | | |
|
||||
| JSP | 无(仅语法高亮) | | |
|
||||
| 语言 | 服务器 | 备选 | 调试器 |
|
||||
| ------------------- | -------------------------------------- | ------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
|
||||
| Java | Eclipse JDT Language Server(`jdtls`) | `java-analyzer`、`kmp-lsp` | Microsoft java-debug,加载在 jdtls 内;用 java-analyzer 时为 `java-analyzer dap` |
|
||||
| Kotlin | Kotlin LSP(JetBrains,`kotlin-lsp`) | Kotlin Language Server(fwcd,`kotlin-language-server`)、`kmp-lsp` | Kotlin Debug Adapter(fwcd) |
|
||||
| Groovy、Gradle 脚本 | `groovy-language-server`(需自行提供) | | |
|
||||
| JSP | 无(仅语法高亮) | | |
|
||||
|
||||
备选服务器只在排在它前面的服务器未安装时才会启动。想手动指定,打开 **设置 › 语言和框架 › 语言服务器**,选中其中一个服务器,在 **Java 语言服务器**(或 Kotlin 语言服务器)里选择:**自动** 使用第一个可用的,**无** 关闭代码智能。这个选择可以全局生效,也可以只对当前项目生效。
|
||||
|
||||
`java-analyzer` 是原生的 Java 语言服务器,运行时不需要 JVM。它自己导入 Maven 和 Gradle 项目(或 `java-analyzer.toml`),也支撑运行和调试:“应用程序”配置从它获取类路径,调试使用它自带的调试适配器(`java-analyzer dap`)。设置了项目 JDK 和 Maven 本地仓库时,OpenIDEA 会把它们传给 java-analyzer,否则它自己查找。
|
||||
|
||||
`kmp-lsp` 不运行 JVM,提供基于语法的 Java 代码智能,没有 JDT 的编译分析、Lombok 支持和 JDT 的重构。构建和运行 Java “应用程序”配置、类路径发现以及 Java 调试器都需要 jdtls。
|
||||
|
||||
### 随 IDE 提供的部分
|
||||
@@ -43,6 +45,7 @@ Java 的代码智能由 Eclipse JDT Language Server(jdtls)提供,OpenIDEA
|
||||
| Kotlin LSP(JetBrains) | `Kotlin/kotlin-lsp` 的 GitHub release |
|
||||
| Kotlin Language Server(fwcd) | `fwcd/kotlin-language-server` 的 GitHub release,需要 Java |
|
||||
| Kotlin Debug Adapter | `fwcd/kotlin-debug-adapter` 的 GitHub release,需要 Java |
|
||||
| java-analyzer | `l0ng-ai/java-analyzer` 的 GitHub release |
|
||||
| kmp-lsp | `Hessesian/kmp-lsp` 的 GitHub release |
|
||||
|
||||
`PATH` 上已有的 `jdtls`(Homebrew、Scoop 或 release 压缩包)也能直接用。OpenIDEA 直接在 JVM 上启动它,不经过它自带的 Python 启动脚本,所以不需要装 Python。没装 java-debug 就开始调试时,IDE 会提示安装,并带着这个 bundle 重启 jdtls。
|
||||
@@ -140,7 +143,7 @@ MyBatis mapper 接口与 XML 语句之间的跳转由 MyBatis Navigator 插件
|
||||
## 已知限制
|
||||
|
||||
- 每个项目窗口运行一个 jdtls,同时打开多个大项目时内存会叠加。可以在 **JVM 选项** 中调低 `-Xmx`,或关闭暂时不用的窗口。**在构建间共享 JDT LS** 只在单个窗口内有效。
|
||||
- 没有 jdtls 时(例如只用 `kmp-lsp`),“应用程序”配置、依赖类路径的功能和 Java 调试都不可用。
|
||||
- 只用 `kmp-lsp`(没有 jdtls 或 java-analyzer)时,“应用程序”配置、依赖类路径的功能和 Java 调试都不可用。
|
||||
- Java 测试通过 Maven 或 Gradle 运行,两者都没有的项目没有测试运行器。
|
||||
- jdtls 自带的 ECJ 编译器有些地方比 javac 严格。已知例子:把泛型方法调用直接用作 `if`、`while`、`for`、`do` 条件或三元运算符条件——例如 `<T> T getCacheObject(String key)` 方法配合 `if (getCacheObject(key))`——javac 可以编译,ECJ 则报 `Type mismatch: cannot convert from Object to boolean`。先把调用赋值给 `boolean` 变量即可两边都编译通过(见 [#2624](https://github.com/l0ng-ai/openidea/issues/2624))。
|
||||
- Kotlin 桥接只支持 Maven,只把编译后的 Kotlin 类暴露给 Java,不提供从 Java 到 Kotlin 源码的跳转或重构。
|
||||
|
||||
@@ -219,11 +219,12 @@ function history(page: Page) {
|
||||
function modelButton(page: Page) {
|
||||
return page.getByRole("button", { name: "Model", exact: true }).filter({ visible: true });
|
||||
}
|
||||
function effortButton(page: Page) {
|
||||
return page.getByRole("button", { name: "Reasoning", exact: true }).filter({ visible: true });
|
||||
/** The effort is shown on the model button, after the model's name. */
|
||||
function effortLabel(page: Page) {
|
||||
return modelButton(page).locator("[class*='modelDetail']");
|
||||
}
|
||||
async function expectEffort(page: Page, name: string) {
|
||||
await expect(effortButton(page)).toHaveText(name);
|
||||
await expect(effortLabel(page)).toHaveText(name);
|
||||
}
|
||||
async function selected(box: Locator) {
|
||||
return box.evaluate((element) => {
|
||||
@@ -364,8 +365,8 @@ test("Settings and effort popup exclude the agent shortcut", async ({ workbench:
|
||||
await expect(search).toBeFocused();
|
||||
await expect(search).toHaveValue("keymap");
|
||||
await settings.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
await effortButton(page).click();
|
||||
const popup = page.getByRole("listbox", { name: "Reasoning", exact: true });
|
||||
await modelButton(page).click();
|
||||
const popup = page.getByRole("radiogroup", { name: "Effort Level", exact: true });
|
||||
await expect(popup).toBeVisible();
|
||||
await page.keyboard.press("Alt+t");
|
||||
expect(await ipcCalls(page, "agent_set_config")).toEqual([]);
|
||||
@@ -584,14 +585,16 @@ test("New Task discovers uncached model effort before the first prompt", async (
|
||||
.poll(async () => (await ipcCalls(page, "agent_refresh_models")).filter((call) => call.model === "swift"))
|
||||
.toEqual([{ provider: provider.id, force: false, model: "swift" }]);
|
||||
await expect(page.getByRole("status").filter({ hasText: "Loading model settings…" })).toBeVisible();
|
||||
await expect(effortButton(page)).toHaveCount(0);
|
||||
await expect(effortLabel(page)).toHaveCount(0);
|
||||
await page.screenshot({ path: testInfo.outputPath("model-settings-loading.png") });
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:model-settings-ready")));
|
||||
await expectEffort(page, "Quick");
|
||||
await effortButton(page).click();
|
||||
await expect(page.getByRole("option", { name: "Quick", exact: true })).toBeVisible();
|
||||
await expect(page.getByRole("option", { name: "Thorough", exact: true })).toBeVisible();
|
||||
await expect(page.getByRole("option", { name: "Gentle", exact: true })).toHaveCount(0);
|
||||
await modelButton(page).click();
|
||||
const efforts = page.getByRole("radiogroup", { name: "Effort Level", exact: true });
|
||||
await expect(efforts.getByRole("radio", { name: "Quick", exact: true })).toBeVisible();
|
||||
await expect(efforts.getByRole("radio", { name: "Thorough", exact: true })).toBeVisible();
|
||||
await expect(efforts.getByRole("radio", { name: "Gentle", exact: true })).toHaveCount(0);
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(box(page)).toHaveText("Keep this first task unsent");
|
||||
await expectNoSubmission(page);
|
||||
expect(await ipcCalls(page, "agent_set_config")).toEqual([]);
|
||||
|
||||
@@ -479,6 +479,67 @@ test("diagnostics underline the range and ⌥⏎ applies the preferred quick fix
|
||||
expect(applied).toMatchObject({ action: { title: "Import 'com.acme.orders.model.Order'" } });
|
||||
});
|
||||
|
||||
test("⌥⏎ opens the list before a slow server answers, then fills it", async ({ workbench: page }) => {
|
||||
const editor = await openSample(page);
|
||||
await page.evaluate(
|
||||
({ file, bad }) => {
|
||||
const action = {
|
||||
title: "Import 'com.acme.orders.model.Order'",
|
||||
kind: "quickfix",
|
||||
isPreferred: true,
|
||||
disabledReason: null,
|
||||
edit: {
|
||||
files: [
|
||||
{
|
||||
kind: "edit",
|
||||
path: file,
|
||||
edits: [
|
||||
{
|
||||
range: { start: { line: 4, col: 0 }, end: { line: 4, col: 0 } },
|
||||
new_text: "import com.acme.orders.model.Order\n",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
command: null,
|
||||
data: null,
|
||||
server: "kotlin",
|
||||
};
|
||||
// The server's answer is held until the test releases it, so "the popup is up while the
|
||||
// server is still thinking" is a fact and not a race against a timer.
|
||||
window.__releaseActions = null;
|
||||
window.__ipc.handlers.lsp_code_actions = () =>
|
||||
new Promise((resolve) => {
|
||||
window.__releaseActions = () => resolve([action]);
|
||||
});
|
||||
window.__ipc.handlers.lsp_execute_code_action = () => [];
|
||||
window.__ipc.emit({
|
||||
type: "diagnostics",
|
||||
path: file,
|
||||
source: "kotlin",
|
||||
items: [
|
||||
{ range: bad, severity: "error", message: "Unresolved reference: Order", source: "kotlin", code: null },
|
||||
],
|
||||
});
|
||||
},
|
||||
{ file: FILE, bad: range(20, 19, 24) },
|
||||
);
|
||||
await caretAt(editor, page, "val order: Order", "Order ");
|
||||
const popup = page.getByTestId("list-popup");
|
||||
await page.keyboard.press("Alt+Enter");
|
||||
await expect(popup).toBeVisible();
|
||||
await expect(popup).toHaveAttribute("aria-busy", "true");
|
||||
expect(await ipcCalls(page, "lsp_code_actions")).toHaveLength(1);
|
||||
// Only now does the server answer.
|
||||
await page.evaluate(() => window.__releaseActions?.());
|
||||
const fix = page.getByRole("option", { name: /Import 'com\.acme\.orders\.model\.Order'/ });
|
||||
await expect(fix).toBeVisible();
|
||||
await expect(popup).not.toHaveAttribute("aria-busy", "true");
|
||||
await fix.click();
|
||||
await expect.poll(() => ipcCalls(page, "lsp_execute_code_action")).toHaveLength(1);
|
||||
});
|
||||
|
||||
test("lazy plugin actions resolve only when invoked, never for their intention preview", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
import { expect, openFromTree, test } from "./fixtures";
|
||||
|
||||
for (const { name, source, expected } of [
|
||||
{
|
||||
name: "multiline documentation comment",
|
||||
source: "/**\n * Creates a visitor record.\n * More detail.\n */\nexport const visitor = 1;",
|
||||
expected: "/** Creates a visitor record. ...*/",
|
||||
},
|
||||
{
|
||||
name: "inline documentation header",
|
||||
source: "/** Returns the visitor name.\n * More detail.\n */\nexport const visitor = 1;",
|
||||
expected: "/**...*/",
|
||||
},
|
||||
{
|
||||
name: "ordinary block comment",
|
||||
source:
|
||||
"/*\n * Ordinary block comment for comparison.\n * It is not a documentation comment.\n */\nexport const visitor = 1;",
|
||||
expected: "/* Ordinary block comment for comparison. ...*/",
|
||||
},
|
||||
]) {
|
||||
test(`folds a JavaScript ${name} like IDEA`, async ({ workbench: page }, testInfo) => {
|
||||
const editor = await openFromTree(page, "App.tsx");
|
||||
const content = editor.locator(".cm-content");
|
||||
await content.click();
|
||||
await page.keyboard.press("Meta+a");
|
||||
await page.keyboard.insertText(source);
|
||||
await expect(editor.locator(".cm-line").first()).toHaveText(source.split("\n")[0]!);
|
||||
|
||||
await editor.locator(".cm-foldGutter .cm-openidea-foldOpen").first().click();
|
||||
await expect(editor.locator(".cm-line").first()).toHaveText(expected);
|
||||
await page.screenshot({ path: testInfo.outputPath("folded.png"), animations: "disabled" });
|
||||
|
||||
await editor.locator(".cm-foldPlaceholder").first().click();
|
||||
await expect(editor.locator(".cm-line").first()).toHaveText(source.split("\n")[0]!);
|
||||
});
|
||||
}
|
||||
@@ -39,6 +39,8 @@ export interface IpcStub {
|
||||
declare global {
|
||||
interface Window {
|
||||
__ipc: IpcStub;
|
||||
/** Releases a stubbed answer a test holds back on purpose (see the ⌥⏎ popup test). */
|
||||
__releaseActions?: (() => void) | null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
import type { Page } from "@playwright/test";
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const FILE = "/dev/acme-api/command-line.txt";
|
||||
|
||||
async function openEditor(page: Page) {
|
||||
const editor = page.locator(".cm-editor").first();
|
||||
await expect(editor).toHaveAttribute("data-openidea-vim", "true");
|
||||
await editor.locator(".cm-content").click();
|
||||
return editor;
|
||||
}
|
||||
|
||||
/** Computed type of one element: `null` when it is not in the DOM. */
|
||||
function fontOf(page: Page, selector: string) {
|
||||
return page.evaluate((sel) => {
|
||||
const el = document.querySelector(sel);
|
||||
if (!el) return null;
|
||||
const style = getComputedStyle(el);
|
||||
return {
|
||||
family: style.fontFamily,
|
||||
size: style.fontSize,
|
||||
ligatures: style.fontVariantLigatures,
|
||||
};
|
||||
}, selector);
|
||||
}
|
||||
|
||||
test.beforeEach(async ({ page }) => {
|
||||
test.setTimeout(180_000);
|
||||
await page.addInitScript(() =>
|
||||
localStorage.setItem("openidea.vim.v1", JSON.stringify({ enabled: true, handlers: {} })),
|
||||
);
|
||||
await page.goto("/");
|
||||
await expect(page.getByRole("tree", { name: "Project" })).toBeVisible();
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(async (path) => {
|
||||
const backendPath = "/src/editor/core/backend.ts";
|
||||
const contributionsPath = "/src/workbench/contributions.ts";
|
||||
const { docBackend } = await import(backendPath);
|
||||
const { editorService } = await import(contributionsPath);
|
||||
docBackend().files.set(path, "alpha\nbravo\ncharlie\n");
|
||||
await editorService().openFile(path);
|
||||
}, FILE);
|
||||
await openEditor(page);
|
||||
});
|
||||
|
||||
test("the command line renders in the editor's font", async ({ page }) => {
|
||||
await page.keyboard.press(":");
|
||||
await expect(page.locator(".cm-vim-panel input")).toBeVisible();
|
||||
await page.keyboard.type("echo hello");
|
||||
|
||||
const prompt = await fontOf(page, ".cm-vim-panel input");
|
||||
// The package puts the prefix in a span with an inline `font-family: monospace`.
|
||||
const prefix = await fontOf(page, ".cm-vim-panel span");
|
||||
const body = await fontOf(page, ".cm-scroller");
|
||||
|
||||
expect(prompt).not.toBeNull();
|
||||
expect(prefix).not.toBeNull();
|
||||
expect(body).not.toBeNull();
|
||||
expect(prompt!.family).toBe(body!.family);
|
||||
expect(prompt!.size).toBe(body!.size);
|
||||
expect(prefix!.family).toBe(prompt!.family);
|
||||
expect(prefix!.size).toBe(prompt!.size);
|
||||
// The browser's generic monospace (Consolas under WebView2) is what we are moving away from.
|
||||
expect(prompt!.family).not.toBe("monospace");
|
||||
expect(prompt!.ligatures).toBe("none");
|
||||
|
||||
await page.keyboard.press("Escape");
|
||||
});
|
||||
|
||||
test("the search prompt shares the command line's font", async ({ page }) => {
|
||||
await page.keyboard.press("/");
|
||||
await expect(page.locator(".cm-vim-panel input")).toBeVisible();
|
||||
await page.keyboard.type("alpha");
|
||||
|
||||
const prompt = await fontOf(page, ".cm-vim-panel input");
|
||||
const body = await fontOf(page, ".cm-scroller");
|
||||
expect(prompt).not.toBeNull();
|
||||
expect(body).not.toBeNull();
|
||||
expect(prompt!.family).toBe(body!.family);
|
||||
expect(prompt!.size).toBe(body!.size);
|
||||
|
||||
await page.keyboard.press("Escape");
|
||||
});
|
||||
|
||||
test("the command line follows the editor's font variables", async ({ page }) => {
|
||||
// What Editor › Font and the zoom field write on the editor root.
|
||||
await page.evaluate(() => {
|
||||
const editor = document.querySelector<HTMLElement>(".cm-editor")!;
|
||||
editor.style.setProperty("--openidea-editor-font", '"Sentinel Mono"');
|
||||
editor.style.setProperty("--openidea-editor-font-size", "21px");
|
||||
});
|
||||
|
||||
await page.keyboard.press(":");
|
||||
await expect(page.locator(".cm-vim-panel input")).toBeVisible();
|
||||
await page.keyboard.type("echo");
|
||||
|
||||
const prompt = await fontOf(page, ".cm-vim-panel input");
|
||||
const body = await fontOf(page, ".cm-scroller");
|
||||
expect(prompt).not.toBeNull();
|
||||
expect(body).not.toBeNull();
|
||||
expect(prompt!.family).toContain("Sentinel Mono");
|
||||
expect(prompt!.size).toBe("21px");
|
||||
expect(prompt!.family).toBe(body!.family);
|
||||
expect(prompt!.size).toBe(body!.size);
|
||||
|
||||
await page.keyboard.press("Escape");
|
||||
});
|
||||
@@ -12,6 +12,7 @@ name = "dart"
|
||||
command = "dart"
|
||||
args = ["language-server", "--protocol=lsp"]
|
||||
root-markers = ["pubspec.yaml", "analysis_options.yaml"]
|
||||
initialization-options = { flutterOutline = true }
|
||||
install-hint = "Install the Dart SDK (https://dart.dev/get-dart) or Flutter"
|
||||
|
||||
# `dart` here; a project that depends on the Flutter SDK is switched to
|
||||
|
||||
@@ -70,6 +70,15 @@ exclusions = ["**/node_modules/**", "**/.metadata/**", "**/archetype-resources/*
|
||||
maven = { enabled = true }
|
||||
gradle = { enabled = true, wrapper = { enabled = true } }
|
||||
|
||||
# java-analyzer: a native Java server that imports Maven / Gradle builds itself and
|
||||
# also serves debugging (`java-analyzer dap`) and the run classpath without jdtls.
|
||||
[[language-servers]]
|
||||
name = "java-analyzer"
|
||||
fallback = true
|
||||
command = "java-analyzer"
|
||||
root-markers = ["java-analyzer.toml", "pom.xml", "build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts", "build.xml", ".project"]
|
||||
install-hint = "Install java-analyzer in Settings › Languages & Frameworks › Language Servers (https://github.com/l0ng-ai/java-analyzer)"
|
||||
|
||||
[[language-servers]]
|
||||
name = "kmp-lsp"
|
||||
fallback = true
|
||||
|
||||
+2
-2
@@ -2,12 +2,12 @@
|
||||
"name": "openidea",
|
||||
"private": true,
|
||||
"description": "An open-source IDE inspired by IntelliJ IDEA",
|
||||
"version": "0.1.48",
|
||||
"version": "0.1.49",
|
||||
"license": "Apache-2.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc --noEmit && vite build && node scripts/check-webkit.ts",
|
||||
"build": "node --max-old-space-size=4096 node_modules/typescript/bin/tsc --noEmit && vite build && node scripts/check-webkit.ts",
|
||||
"preview": "vite preview",
|
||||
"tauri": "node scripts/tauri.ts",
|
||||
"test": "vitest run",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// The commit being prepared in the window the current command or event came
|
||||
/// from (the Commit tool window, or the Commit dialog while it is open): the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Plugin-owned project data sources. Requires database.sources and project trust.
|
||||
/// Runs on the Database subsystem's host, including on remote project servers.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Editor and project-tree decorations (API 1.4). Requires project.read. An editor set
|
||||
/// follows its file: the file's own project, or the nearest one when it is outside them all.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// What the pane beside the Services tree shows for a plugin's node.
|
||||
interface detail-types {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Optional export (world `plugin-diagnostics`): problems in the current,
|
||||
/// possibly unsaved document, for the languages declared with the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// HTTP endpoints found in a project (`[[contributes.endpoints]]`).
|
||||
interface endpoints-provider {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Workbench events, delivered in batches to `event-handler.handle`.
|
||||
interface events {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
interface lifecycle {
|
||||
use types.{context, error};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// What other plugins contributed to the extension points this plugin declares
|
||||
/// (`[[extension-points]]` in `plugin.toml`; the contributors list this plugin
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Optional export (world `plugin-file-actions`): quick fixes and
|
||||
/// refactorings that create, rename or delete files, next to the text edits
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Files outside the open projects: the configuration of the program a
|
||||
/// plugin integrates with, a tool installed elsewhere, a licence file.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Writes to the IDE log, tagged with the plugin id.
|
||||
interface log {
|
||||
@@ -34,6 +34,31 @@ interface ui {
|
||||
text(string),
|
||||
}
|
||||
|
||||
/// A highlight rule for Run and Debug console output (API 1.12).
|
||||
record console-rule {
|
||||
/// A regular expression (at most 512 bytes) in the syntax shared by
|
||||
/// Rust's `regex` and JavaScript: no inline flags, named groups,
|
||||
/// lookaround, backreferences, `\A`, `\z`, `\p`, POSIX classes or
|
||||
/// repeated groups such as `(…)+`. A pattern that could take too long
|
||||
/// on a long line is `invalid`. It sees the first 2000 characters of a line.
|
||||
pattern: string,
|
||||
ignore-case: bool,
|
||||
/// A console palette colour: `black`, `red`, `green`, `yellow`,
|
||||
/// `blue`, `magenta`, `cyan`, `white`, or one of them with `bright-`
|
||||
/// (`bright-red`). The colour scheme's Console Colors decide how they
|
||||
/// look. Unknown names are ignored.
|
||||
foreground: option<string>,
|
||||
/// A palette colour behind the text, as `foreground`.
|
||||
background: option<string>,
|
||||
/// Any of `bold`, `italic`, `underline`, `strikethrough`, `dim`.
|
||||
/// Unknown names are ignored.
|
||||
styles: list<string>,
|
||||
/// Style the whole line instead of only the matched text.
|
||||
whole-line: bool,
|
||||
/// A disabled rule keeps its place in the list but never matches.
|
||||
enabled: bool,
|
||||
}
|
||||
|
||||
/// A notification button that runs one of the plugin's commands.
|
||||
record notification-action {
|
||||
/// Up to 256 bytes, one line.
|
||||
@@ -65,6 +90,17 @@ interface ui {
|
||||
set-window-status-item: func(id: string, item: status-item) -> result<_, error>;
|
||||
/// Removes this window's override, falling back to the global item.
|
||||
remove-window-status-item: func(id: string) -> result<_, error>;
|
||||
/// Replaces the plugin's console highlight rules (API 1.12); an empty
|
||||
/// list removes them. Every window applies them to the stdout and stderr
|
||||
/// lines of its Run and Debug consoles; the plugin never sees the output.
|
||||
/// The first enabled whole-line rule that matches a line styles it,
|
||||
/// instead of the colour of its log level; each enabled match-only rule
|
||||
/// styles its matches on top, an earlier rule winning where matches
|
||||
/// overlap. A rule's colours and styles replace the program's own. Rules
|
||||
/// of several plugins apply in plugin id order. At most 100 rules; an
|
||||
/// invalid one fails the call and keeps the previous rules. They go
|
||||
/// away when the plugin stops. Needs no capability.
|
||||
set-console-rules: func(rules: list<console-rule>) -> result<_, error>;
|
||||
/// Sets the plugin's context key `key`, which `when` clauses test as
|
||||
/// `plugin.<id>.<key>`, in the window the current command or event came
|
||||
/// from (every window when there is none). A window's value takes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Optional export (world `plugin-hover`): Markdown added to the hover of
|
||||
/// documents of the languages declared with the `hover` provider kind,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Cross-file associations a plugin publishes for the files it declares under
|
||||
/// `[[contributes.documentIndexers]]`. The host calls `index` in cancellable
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Embedded languages. The host routes plugin providers and configured language
|
||||
/// servers inside these ranges, preserving host-document UTF-16 coordinates.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Optional export (world `plugin-inlay-hints`): inline hints in documents of
|
||||
/// the languages declared with the `inlay-hints` provider kind, including
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Problems in files, shown in the editor and the Problems view.
|
||||
interface diagnostics {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Additional language features, called only for declared API 1.4 provider kinds.
|
||||
/// Editor calls have a 50 ms soft / 500 ms hard budget; formatting has 5 seconds.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Discovery of the IDE's built-in MCP server; never exposes its URL or token.
|
||||
interface mcp {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/// `fs` and `workspace`, and everything else goes through the imports below,
|
||||
/// gated by the capabilities granted in `plugin.toml` (a missing one returns
|
||||
/// `error::denied`).
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
world plugin {
|
||||
import log;
|
||||
@@ -212,3 +212,8 @@ world mcp-tools { export mcp-provider; }
|
||||
world plugin-run-target-validation { include plugin; export run-target-validation; }
|
||||
/// Export-only validation, composed with the base plugin world.
|
||||
world run-target-validator { export run-target-validation; }
|
||||
|
||||
/// A plugin with custom Search Everywhere categories.
|
||||
world plugin-search { include plugin; export search-provider; }
|
||||
/// Optional export composed with the base plugin by the SDK.
|
||||
world search { export search-provider; }
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Editor features a plugin provides for the languages it declares under
|
||||
/// `[[contributes.providers]]` (the host calls only declared kinds). They run
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Project-scoped targets owned by the registering plugin (API 1.4).
|
||||
interface run-targets {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:[email protected]1.0;
|
||||
package openidea:[email protected]3.0;
|
||||
|
||||
/// Launches this plugin's configurations in the invoking window's Run tool window.
|
||||
interface run {
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package openidea:[email protected];
|
||||
|
||||
/// On-demand results for `[[contributes.searchCategories]]`. Optional, API 1.13.
|
||||
interface search-provider {
|
||||
use types.{error, location};
|
||||
use invocation.{invocation};
|
||||
|
||||
record search-command {
|
||||
/// A command declared by this plugin, without the host's prefix.
|
||||
id: string,
|
||||
arg: option<string>,
|
||||
}
|
||||
variant search-target {
|
||||
/// A valid UTF-16 range inside the current project.
|
||||
location(location),
|
||||
command(search-command),
|
||||
}
|
||||
record search-item {
|
||||
/// Stable within this plugin's category and query results.
|
||||
id: string,
|
||||
title: string,
|
||||
description: option<string>,
|
||||
target: search-target,
|
||||
}
|
||||
record search-page {
|
||||
items: list<search-item>,
|
||||
has-more: bool,
|
||||
}
|
||||
/// The category's local manifest id, raw query (at most 1024 UTF-8 bytes),
|
||||
/// and requested maximum (1–200). Preserve ranking in the returned list.
|
||||
/// Empty queries may return initial suggestions. This is a background call:
|
||||
/// no prompts or implicit commands. Superseded queries are cancelled by the host.
|
||||
search: func(category: string, query: string, limit: u32, ctx: borrow<invocation>) -> result<search-page, error>;
|
||||
}
|
||||
Loaded 100 of 214 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Заблокувати користувача