Andrei Listochkin
00a97272f2
automate braceless return substitution for long lines
...
Per [bjorn3][https://github.com/bjorn3 ] suggestion resolves cases where
an early return is moved to a separate line due to line width formatting.
This setting changes
```
if (a very long condition) return;
```
to
```
if (a very long
condition) {
return;
}
```
while keeping
```
if (short) return;
```
as is.
In pathological cases this may cause `npm run fix` not to fix formatting
in one go and may require running it twice.
2022-05-17 18:31:51 +01:00
Andrei Listochkin
e0df2c9bee
remove tsfmt from dependencies
2022-05-17 18:16:04 +01:00
Andrei Listochkin
1add3e6395
add prettier format commit to ignored revisions
2022-05-17 18:15:51 +01:00
Andrei Listochkin
f247090558
prettier run
2022-05-17 18:15:06 +01:00
Andrei Listochkin
8e9f54f238
use prettier to format the code
2022-05-17 18:14:28 +01:00
Andrei Listochkin
4fcdb0fea0
prettier config
...
[Prettier][1] is an up-to date code formatter for JavaScript ecosystem.
For settings we rely on [EditorConfig][2] for things like tab style and
size (with added bonus that the code editor with an EditorConfig plugin
does some automated code formatting on file save for you). Unfortunately,
Prettier's Glob handling isn't great:
1. `*.{ts,js,json}` has no effect
2. Similarly, in a list of globs `*.ts,*.js,*.json` only the first glob
has an effect, the rest are ignored.
That's why the file looks the way it does.
The only other setting we change is line width. [Lukas][3] suggested we
use 100 instead of 80, because that's what Rustfmt is using.
[1]: https://prettier.io
[2]: https://editorconfig.org
[3]: https://github.com/Veykril
2022-05-17 18:12:49 +01:00
bors
7e95c14ea7
Auto merge of #12292 - jonas-schievink:bump-extension-version, r=jonas-schievink
...
internal: Bump extension version
2022-05-17 14:03:08 +00:00
Jonas Schievink
21b6ce8b8e
Bump extension version
2022-05-17 16:02:07 +02:00
bors
c5c442eee1
Auto merge of #12285 - Veykril:inlay-hints, r=Veykril
...
feat: Implement inlay hint tooltips
Currently this just delegates to hover request for some things, and otherwise fallsback to the label.
2022-05-17 13:11:40 +00:00
Lukas Wirth
58a241134c
Update test output
2022-05-17 14:58:26 +02:00
bors
f8fc0ea528
Auto merge of #12289 - rust-lang:Veykril-patch-1, r=Veykril
...
fix: Fix incorrect config key in client config update
Closes https://github.com/rust-lang/rust-analyzer/issues/12288
2022-05-17 12:56:25 +00:00
Lukas Wirth
d43b9dae56
Fix incorrect config key in client config update
...
Closes https://github.com/rust-lang/rust-analyzer/issues/12288
2022-05-17 14:56:08 +02:00
Lukas Wirth
0c488fa215
Update lsp-extensions hash
2022-05-17 14:48:28 +02:00
Lukas Wirth
21f37a6d9e
Allow inlay hint tooltips to trigger hovers
2022-05-17 14:46:43 +02:00
Lukas Wirth
a2ec010185
Trigger hover requests on closing brace hints
2022-05-17 13:39:45 +02:00
Lukas Wirth
0756719a30
Replace some SmolStr usages with String as the conversion happens anyways
2022-05-17 12:56:14 +02:00
Lukas Wirth
91833f1974
feat: Implement inlay hint tooltips
2022-05-17 12:49:51 +02:00
bors
3bbdb0dbb6
Auto merge of #12284 - Veykril:inlay-hints, r=Veykril
...
internal: Cleanup lifetime elision hints
2022-05-17 10:19:14 +00:00
Lukas Wirth
12d5343993
internal: Cleanup lifetime elision hints
2022-05-17 12:18:07 +02:00
bors
ce9b174f8a
Auto merge of #12276 - jonas-schievink:improve-generate-deref-impl, r=jonas-schievink
...
feat: Improve "Generate `Deref` impl" assist
Fixes https://github.com/rust-lang/rust-analyzer/issues/12265
Fixes https://github.com/rust-lang/rust-analyzer/issues/12266
The assist will now generate a `DerefMut` impl if a `Deref` impl is already present.
2022-05-16 18:12:53 +00:00
Jonas Schievink
1df6560fd8
Improve "Generate Deref impl" assist
2022-05-16 20:10:46 +02:00
bors
8bc6a8fe6d
Auto merge of #12275 - jonas-schievink:remove-setter-doc-gen, r=jonas-schievink
...
fix: Don't generate documentation in `generate_setter`
Followup to https://github.com/rust-lang/rust-analyzer/pull/12274
2022-05-16 17:28:01 +00:00
Jonas Schievink
54c8c39da0
Don't generate documentation in generate_setter
2022-05-16 19:27:27 +02:00
bors
da503b6a13
Auto merge of #12274 - jonas-schievink:move-getter-docs-generation, r=jonas-schievink
...
feat: Handle getters and setters in documentation template assist
The assist can now turn this:
```rust
pub struct S;
impl S {
pub fn data_mut$0(&mut self) -> &mut [u8] { &mut [] }
}
```
into
```rust
pub struct S;
impl S {
/// Returns a mutable reference to the data.
///
/// # Examples
///
/// ```
/// use test::S;
///
/// let mut s = ;
/// assert_eq!(s.data_mut(), );
/// assert_eq!(s, );
/// ```
pub fn data_mut(&mut self) -> &mut [u8] { &mut [] }
}
```
And similarly for by-value or immutable getters, and for setters. Previously the intro line would be empty.
This PR also removes the documentation generation function from the "Generate getter/setter" assist, since that is better handled by applying the 2 assists in sequence. cc https://github.com/rust-lang/rust-analyzer/issues/12273
2022-05-16 17:14:16 +00:00
Jonas Schievink
f1b6e45fba
Handle getters and setters in documentation template assist
2022-05-16 19:10:38 +02:00
bors
825ce48180
Auto merge of #12271 - bitgaoshu:box_with_expec, r=flodiebold
...
fix #12227 Type mismatch error shown
add box expectation hint
2022-05-16 15:00:36 +00:00
bors
795930717b
Auto merge of #12272 - jonas-schievink:fix-signature-help-offsets, r=jonas-schievink
...
fix: Fix signature help LSP offset conversion
Fixes https://github.com/rust-lang/rust-analyzer/issues/12270
I don't think we really handle this correctly anywhere (eg. surrogates probably aren't counted right), but this at least fixes the immediately visible bug.
2022-05-16 13:50:00 +00:00
Jonas Schievink
5ee028bbb8
Fix signature help LSP offset conversion
2022-05-16 15:48:38 +02:00
bors
ee2cbe0ae8
Auto merge of #12244 - jonas-schievink:closing-brace-hints, r=jonas-schievink
...
feat: Show inlay hints after a `}` to indicate the closed item
Closes https://github.com/rust-lang/rust-analyzer/issues/7315
2022-05-16 13:25:04 +00:00
Jonas Schievink
fccc12982e
Add closing brace hints for macros
2022-05-16 15:23:25 +02:00
bitgaoshu
e362929fa1
add box expection hint
2022-05-16 21:17:00 +08:00
Jonas Schievink
867a7dc7a0
Show inlay hints after a } to indicate the closed item
2022-05-16 14:55:47 +02:00
bors
58234c64da
Auto merge of #12256 - matklad:m, r=matklad
...
minor: rename
2022-05-16 11:44:00 +00:00
Aleksey Kladov
2f3453994a
minor: rename
2022-05-16 12:42:48 +01:00
bors
1dc25e51a0
Auto merge of #12253 - Veykril:bm, r=Veykril
...
feat: Add binding mode inlay hints
2022-05-16 11:16:22 +00:00
bors
ac4ce4259b
Auto merge of #12242 - flodiebold:extension-description, r=flodiebold
...
Improve extension description and README
2022-05-15 18:11:32 +00:00
bors
5ae9847dea
Auto merge of #12262 - jhgg:fix-whitespace-between-mut-self-in-macro-expansion, r=lnicola
...
ide: insert whitespace between 'mut' and 'self' in macro expansion
fixes #12260
2022-05-15 12:47:38 +00:00
bors
fa133d065b
Auto merge of #12190 - harpsword:fix_diagostics_map_incorrectly, r=harpsword
...
fix cargo check diagnostics are mapped incorrectly with non-BMP codepoints
fix #11945
2022-05-15 09:48:51 +00:00
Jake Heinz
4efc2a9df2
ide: insert whitespace between 'mut' and 'self' in macro expansion
2022-05-15 07:55:13 +00:00
bors
1ff5b2cab4
Auto merge of #12251 - matklad:lsp-server, r=matklad
...
internal: vendor lsp-server
2022-05-14 20:20:01 +00:00
Aleksey Kladov
57cb65bb7a
internal: vendor lsp-server
2022-05-14 21:15:43 +01:00
Lukas Wirth
977f0ba968
Update package.json
2022-05-14 15:18:18 +02:00
Lukas Wirth
7cbde1b3a5
Enable reborrow hints in attribute calls
2022-05-14 15:00:14 +02:00
Lukas Wirth
6b696fced8
feat: Add binding mode inlay hints
2022-05-14 14:58:35 +02:00
bors
50ed1a507e
Auto merge of #12252 - Veykril:config, r=Veykril
...
internal: Make VSCode config more GUI edit friendly
2022-05-14 11:56:11 +00:00
Lukas Wirth
622defb373
internal: Make VSCode config more GUI edit friendly
2022-05-14 13:53:41 +02:00
harpsword
7bd4c11e13
fix diagnostics location map incorrectly from rustc span to lsp position for non-BMP char
2022-05-14 19:19:55 +08:00
Florian Diebold
3dcf9e0f2e
Change description
2022-05-13 22:13:23 +02:00
bors
06448c5548
Auto merge of #12246 - Veykril:config, r=Veykril
...
fix: Fix incorrect hover actions config keys
2022-05-13 19:36:32 +00:00
Lukas Wirth
8496633c87
Don't make r-a fail to initialize if updating the config fails
2022-05-13 21:20:37 +02:00
