]>
git.lizzy.rs Git - rust.git/log
Florian Diebold [Thu, 29 Apr 2021 18:00:21 +0000 (20:00 +0200)]
Add test for #8686
bors[bot] [Thu, 29 Apr 2021 07:45:37 +0000 (07:45 +0000)]
Merge #8687
8687: fix: closure unify without check ClosureId r=lnicola a=komonad
Previously, the unification of closure types is blocked by `Ty.equals_ctor` which compares the ClosureId of the closures. Here is a workaround to allow closures to unify their substitutions.
Fixes #8604.
Co-authored-by: Comonad <comonad@foxmail.com>
Comonad [Thu, 29 Apr 2021 07:26:41 +0000 (15:26 +0800)]
fix: closure unify without check ClosureId
closes #8604
bors[bot] [Thu, 29 Apr 2021 01:09:37 +0000 (01:09 +0000)]
Merge #8685
8685: feat: parse const param defaults r=jonas-schievink a=jonas-schievink
These will probably be stabilized in a few releases, let's make sure we can at least parse them
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 29 Apr 2021 01:07:53 +0000 (03:07 +0200)]
Parse const param defaults
bors[bot] [Thu, 29 Apr 2021 00:28:27 +0000 (00:28 +0000)]
Merge #8684
8684: Correctly parse negated literals as const args r=jonas-schievink a=jonas-schievink
Previously we didn't accept `S::<-0>;`
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 29 Apr 2021 00:16:22 +0000 (02:16 +0200)]
Correctly parse negated literals as const args
bors[bot] [Wed, 28 Apr 2021 10:13:52 +0000 (10:13 +0000)]
Merge #8683
8683: internal: ensure that client and server-side configs are not mixed up r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 28 Apr 2021 10:06:46 +0000 (13:06 +0300)]
internal: ensure that client and server-side configs are not mixed up
https://github.com/rust-lang/rust/issues/84647 would help big time here.
bors[bot] [Tue, 27 Apr 2021 20:41:35 +0000 (20:41 +0000)]
Merge #8624
8624: Automatically detect rust library source file map r=vsrs a=vsrs
This PR adds a new possible `rust-analyzer.debug.sourceFileMap` value:
```json
{
"rust-analyzer.debug.sourceFileMap": "auto"
}
```
I did not make it the default because it uses two shell calls (`rustc --print sysroot` and `rustc -V -v`). First one can be slow (https://github.com/rust-lang/rustup/issues/783)
Fixes #8619
Co-authored-by: vsrs <vit@conrlab.com>
bors[bot] [Tue, 27 Apr 2021 13:22:09 +0000 (13:22 +0000)]
Merge #8629 #8657
8629: Allow pressing | to surround closure arguments in VSCode r=matklad a=Smittyvb
This makes pressing <kbd>|</kbd> while some text is selected surround that text with pipes. This is useful when writing closures.
In this demo, I press <kbd>|</kbd> to easily surround some text (`predicate`) with pipe characters to create a closure. Before, this would have replaced `predicate` with just `|`.
![](https://user-images.githubusercontent.com/
10530973 /
115778847 -
3c257e00 -a385-11eb-8c80-
e0db970747db .gif)
(I am getting failures when I do `cargo test` even on `master` locally (due to #8585 I think), but GH Actions is fine with this)
8657: npm update r=matklad a=kjeremy
Co-authored-by: Smittyvb <me@smitop.com>
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
bors[bot] [Tue, 27 Apr 2021 13:10:22 +0000 (13:10 +0000)]
Merge #8679
8679: fix: don't show error message for a valid notification r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 27 Apr 2021 13:04:12 +0000 (16:04 +0300)]
fix: don't show error message for a valid notification
Closes #6782, #6772
bors[bot] [Tue, 27 Apr 2021 11:51:03 +0000 (11:51 +0000)]
Merge #8677
8677: Return ServerNotInitialized according to the spec r=kjeremy a=kjeremy
According to the spec we should return ServerNotInitialized if the server is waiting for an initialize request and something else comes in.
Upgrading to lsp-server 0.5.1 will do this and retry until the initialize request comes in.
Fixes #8581
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
Jeremy Kolb [Tue, 27 Apr 2021 11:47:06 +0000 (07:47 -0400)]
Return ServerNotInitialized according to the spec
According to the spec we should return ServerNotInitialized if the server is waiting for an initialize request and something else comes in.
Upgrading to lsp-server 0.5.1 will do this and retry until the initialize request comes in.
Fixes #8581
bors[bot] [Tue, 27 Apr 2021 08:31:35 +0000 (08:31 +0000)]
Merge #8617
8617: Add option to opt out of smaller font size for inlay hints. r=SomeoneToIgnore a=jmederosalvarado
As requested on issue #6883 this PR provides an option for users to opt out of the smaller font size for inlay hints. Part of #6883.
Co-authored-by: Jorge Mederos Alvarado <jmederosalvarado@gmail.com>
Jorge Mederos Alvarado [Tue, 27 Apr 2021 00:26:36 +0000 (20:26 -0400)]
Fix how and when old inlay hint decorations are disposed
Jorge Mederos Alvarado [Wed, 21 Apr 2021 21:14:17 +0000 (17:14 -0400)]
Add config options
Jorge Mederos Alvarado [Wed, 21 Apr 2021 19:48:57 +0000 (15:48 -0400)]
Add option to opt out from smaller inlay hints font size
Jorge Mederos Alvarado [Wed, 21 Apr 2021 19:09:41 +0000 (15:09 -0400)]
add option to package.json
bors[bot] [Mon, 26 Apr 2021 16:31:19 +0000 (16:31 +0000)]
Merge #8671
8671: minor: simplify r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 26 Apr 2021 16:30:50 +0000 (19:30 +0300)]
minor: simplify
bors[bot] [Mon, 26 Apr 2021 16:18:02 +0000 (16:18 +0000)]
Merge #8670
8670: fix: make error message in the status bar more useful r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 26 Apr 2021 16:16:07 +0000 (19:16 +0300)]
fix: make error message in the status bar more useful
At the moment,the popup is just a bazillion of Cargo's "Compiling this\nCompiling that",
which is not that useful.
--quiet still displays error, which is what we needc
bors[bot] [Mon, 26 Apr 2021 14:17:05 +0000 (14:17 +0000)]
Merge #8668
8668: Use more cross-platform utc `date` argument r=matklad a=SomeoneToIgnore
Part of https://github.com/rust-analyzer/rust-analyzer/issues/8571
```
$ docker run -it --rm ubuntu:20.04 bash
root@
7393d1e7bbad :/# date -u +%Y-%m-%d
2021-04-26
```
```
$ date -u +%Y-%m-%d
2021-04-26
$ uname -a
Darwin alaptop.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:07:06 PST 2021; root:xnu-7195.81.3~1/RELEASE_X86_64 x86_64
```
Some of the places where I've change this do not really require it (since macos bin would have failed with `--iso` param also), but I've changed them for consistency.
Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
Kirill Bulatov [Mon, 26 Apr 2021 14:12:07 +0000 (17:12 +0300)]
Use -u instead of --utc date flag
bors[bot] [Mon, 26 Apr 2021 12:27:35 +0000 (12:27 +0000)]
Merge #8666
8666: fix: correct version string on windows and mac r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 26 Apr 2021 12:20:15 +0000 (15:20 +0300)]
fix: add date to the version string on Mac
It doesn't support `--iso`
Aleksey Kladov [Mon, 26 Apr 2021 12:17:02 +0000 (15:17 +0300)]
fix: dont' misundentify nightly as stable in --version on Mac&Win
We used to set `--nightly` in CI, and only for linux. Let's detect this
in xtask instead.
bors[bot] [Mon, 26 Apr 2021 10:49:40 +0000 (10:49 +0000)]
Merge #8661
8661: internal: make normal release after a poin release less annoying r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 26 Apr 2021 10:49:19 +0000 (13:49 +0300)]
Update xtask/src/release.rs
Co-authored-by: Laurențiu Nicola <lnicola@users.noreply.github.com>
Aleksey Kladov [Mon, 26 Apr 2021 10:49:14 +0000 (13:49 +0300)]
Update xtask/src/release.rs
Co-authored-by: Laurențiu Nicola <lnicola@users.noreply.github.com>
Aleksey Kladov [Mon, 26 Apr 2021 10:41:34 +0000 (13:41 +0300)]
internal: make normal release after a poin release less annoying
bors[bot] [Mon, 26 Apr 2021 09:39:15 +0000 (09:39 +0000)]
Merge #8660
8660: Added `mutable` semantic token modifier for `&mut self` methods r=Veykril a=1c3t3a
This closes #8644.
Co-authored-by: Bastian Kersting <bastian@cmbt.de>
Bastian Kersting [Mon, 26 Apr 2021 09:37:28 +0000 (11:37 +0200)]
Fixed formatting
Bastian Kersting [Mon, 26 Apr 2021 07:22:36 +0000 (09:22 +0200)]
Added mutable semantic token modifier for &mut self methods
bors[bot] [Sun, 25 Apr 2021 21:18:57 +0000 (21:18 +0000)]
Merge #8658
8658: Check more carefully for cases where a rename can't be done r=Veykril a=dzhu
Attempting to rename an element of a tuple field would previously replace the type with the new name, which doesn't make sense; now it fails instead.
The check is done in both `prepare_rename` and `rename` so that the case is caught before the user is prompted for a new name. Some other existing failure cases are also now additionally checked in `prepare_rename`.
Closes: #8592
(I threw in some doc edits for a relevant type; of course, I can remove those if the policy here is to be strict about scope of changes within a PR.)
Co-authored-by: Danny Zhu <dzhu@dzhu.us>
Danny Zhu [Sun, 25 Apr 2021 20:28:38 +0000 (13:28 -0700)]
Check more carefully for cases where a rename can't be done
Attempting to rename an element of a tuple field would previously
replace the type with the new name, which doesn't make sense; now it
fails instead.
The check is done in both `prepare_rename` and `rename` so that the case
is caught before the user is prompted for a new name. Some other
existing failure cases are also now additionally checked in
`prepare_rename`.
Jeremy Kolb [Sun, 25 Apr 2021 20:16:01 +0000 (16:16 -0400)]
npm update
bors[bot] [Sun, 25 Apr 2021 19:44:47 +0000 (19:44 +0000)]
Merge #8656
8656: Update deps r=kjeremy a=kjeremy
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
Jeremy Kolb [Sun, 25 Apr 2021 19:43:42 +0000 (15:43 -0400)]
Update deps
bors[bot] [Sat, 24 Apr 2021 11:39:50 +0000 (11:39 +0000)]
Merge #8647
8647: internal: Split out merge_imports module from helpers::insert_use r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Sat, 24 Apr 2021 11:31:16 +0000 (13:31 +0200)]
Split out merge_imports module from helpers::insert_use
bors[bot] [Sat, 24 Apr 2021 10:37:42 +0000 (10:37 +0000)]
Merge #8643
8643: fix: correct version string to contain hash, build date and channel r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 24 Apr 2021 10:36:45 +0000 (13:36 +0300)]
fix: correct version string to contain hash, build date and channel
Aleksey Kladov [Sat, 24 Apr 2021 07:31:58 +0000 (10:31 +0300)]
minor
bors[bot] [Sat, 24 Apr 2021 06:09:21 +0000 (06:09 +0000)]
Merge #8641
8641: minor r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 24 Apr 2021 06:08:56 +0000 (09:08 +0300)]
minor
bors[bot] [Fri, 23 Apr 2021 19:09:37 +0000 (19:09 +0000)]
Merge #8639
8639: fix: 'configuration.property' error in VS Code r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 23 Apr 2021 19:08:09 +0000 (22:08 +0300)]
fix: 'configuration.property' error in VS Code
closes #7789
bors[bot] [Fri, 23 Apr 2021 16:49:08 +0000 (16:49 +0000)]
Merge #8591 #8638
8591: Remove SyntaxRewriter usage in insert_use in favor of mutable syntax trees r=matklad a=Veykril
Unfortunately changing `insert_use` to not use `SyntaxRewriter` creates a lot of changes since so much relies on that. But on the other hand this should be the biggest usage of `SyntaxRewriter` I believe.
8638: Remove SyntaxRewriter::from_fn r=Veykril a=Veykril
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Fri, 23 Apr 2021 16:36:43 +0000 (18:36 +0200)]
Remove SyntaxRewriter::from_fn
bors[bot] [Fri, 23 Apr 2021 15:28:55 +0000 (15:28 +0000)]
Merge #8637
8637: Tag `yield` and `await` as ControlFlow in semantic highlighting r=Veykril a=Veykril
and shuffle some code around
Closes #8634
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Fri, 23 Apr 2021 15:19:46 +0000 (17:19 +0200)]
Simplify highlight token match guards
Lukas Wirth [Fri, 23 Apr 2021 14:57:03 +0000 (16:57 +0200)]
Sort HlMod variants and ALL const
Lukas Wirth [Fri, 23 Apr 2021 14:43:48 +0000 (16:43 +0200)]
Tag `yield` and `await` as ControlFlow in semantic highlighting
bors[bot] [Fri, 23 Apr 2021 13:37:48 +0000 (13:37 +0000)]
Merge #8317
8317: Convert tuple struct to named struct assist r=Veykril a=unexge
Closes https://github.com/rust-analyzer/rust-analyzer/issues/8192
Co-authored-by: unexge <unexge@gmail.com>
unexge [Fri, 23 Apr 2021 13:18:10 +0000 (16:18 +0300)]
Add missing test case for "Convert to named struct" assist
unexge [Fri, 23 Apr 2021 10:08:07 +0000 (13:08 +0300)]
Stop iterating reference after made an edit in "Convert to named struct" assist
Smittyvb [Thu, 22 Apr 2021 19:57:30 +0000 (15:57 -0400)]
Support | as a surrounding pairs
bors[bot] [Thu, 22 Apr 2021 18:48:53 +0000 (18:48 +0000)]
Merge #8628
8628: minor: Add one more profiling span to add_dep r=lnicola a=lnicola
CC #8623
bors r+
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 22 Apr 2021 18:48:17 +0000 (21:48 +0300)]
Add one more profiling span to add_dep
bors[bot] [Thu, 22 Apr 2021 18:26:09 +0000 (18:26 +0000)]
Merge #8627
8627: Add profiling spans under cargo_to_crate_graph r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 22 Apr 2021 18:25:29 +0000 (21:25 +0300)]
Add profiling spans under cargo_to_crate_graph
bors[bot] [Thu, 22 Apr 2021 17:35:41 +0000 (17:35 +0000)]
Merge #8605
8605: internal: Automatically categorize the changelog entries r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
vsrs [Thu, 22 Apr 2021 15:30:44 +0000 (18:30 +0300)]
Use explicit rustc commit-hash
Required for lldb on mac
bors[bot] [Thu, 22 Apr 2021 15:22:43 +0000 (15:22 +0000)]
Merge #8620
8620: Remove unnecessary braces for extracted block expression r=Veykril a=brandondong
This change addresses the first bullet point of https://github.com/rust-analyzer/rust-analyzer/issues/7839.
Specifically, when extracting block expressions, remove the unneeded extra braces inside the generated function.
Co-authored-by: Brandon <brandondong604@hotmail.com>
vsrs [Thu, 22 Apr 2021 13:09:46 +0000 (16:09 +0300)]
Add special `auto` value for `debug.sourceFileMap`
vsrs [Thu, 22 Apr 2021 12:27:56 +0000 (15:27 +0300)]
Autodetect rust library source file map
unexge [Thu, 22 Apr 2021 08:33:56 +0000 (11:33 +0300)]
Move reference editing logic into own function to make error handling more ease in "Convert to named struct" assist
bors[bot] [Thu, 22 Apr 2021 08:29:01 +0000 (08:29 +0000)]
Merge #8621
8621: feat: make sure nightly regressions don't break users r=lnicola a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Thu, 22 Apr 2021 08:15:20 +0000 (11:15 +0300)]
feat: make sure nightly regressions don't break users
Brandon [Wed, 21 Apr 2021 06:41:17 +0000 (23:41 -0700)]
Remove unnecessary braces for extracted block expression
bors[bot] [Wed, 21 Apr 2021 23:54:47 +0000 (23:54 +0000)]
Merge #8595
8595: Diagnostic paths support specifying `remapPrefix` r=rickvanprim a=rickvanprim
Currently VSCode Problem Matchers will resolve a path like `//foo_crate/src/main.rs` if `${workspaceFolder}/foo_crate/src/main.rs` exists. Presumably their behavior is functionally a string concatenation that would produce `${workspaceFolder///foo_crate/src/main.rs` and repeated path separators get ignored.
This PR attempts to mimic this behavior by stripping any `Component::RootDir` from `file_name` before joining it to `workspace_root`, and then checking if the file exists. If it does, this path is used, and if not, the behavior falls through to the existing Rust path join behavior.
Co-authored-by: James Leitch <rickvanprim@gmail.com>
Lukas Wirth [Wed, 21 Apr 2021 22:54:31 +0000 (00:54 +0200)]
Don't filter equal nodes in reorder assists
James Leitch [Wed, 21 Apr 2021 22:09:37 +0000 (15:09 -0700)]
Code review feedback.
James Leitch [Wed, 21 Apr 2021 03:03:35 +0000 (20:03 -0700)]
Diagnostic Remap Path Prefixes added.
James Leitch [Tue, 20 Apr 2021 03:18:54 +0000 (20:18 -0700)]
Diagnostic paths attempt to use VSCode's path join behavior before defaulting to Rust's path join behavior.
bors[bot] [Wed, 21 Apr 2021 21:56:54 +0000 (21:56 +0000)]
Merge #8570
8570: Flycheck tries to parse both Cargo and Rustc messages. r=rickvanprim a=rickvanprim
This change allows non-Cargo build systems to be used for Flycheck provided they call `rustc` with `--error-format=json` and emit those JSON messages to `stdout`.
Co-authored-by: James Leitch <rickvanprim@gmail.com>
bors[bot] [Wed, 21 Apr 2021 16:20:56 +0000 (16:20 +0000)]
Merge #8616
8616: minor: Bump deps r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Wed, 21 Apr 2021 16:20:18 +0000 (19:20 +0300)]
Bump other deps
Laurențiu Nicola [Wed, 21 Apr 2021 16:20:01 +0000 (19:20 +0300)]
Bump chalk
Laurențiu Nicola [Wed, 21 Apr 2021 16:19:27 +0000 (19:19 +0300)]
Bump rustc_lexer
bors[bot] [Wed, 21 Apr 2021 16:10:55 +0000 (16:10 +0000)]
Merge #8615
8615: skip: Remove `ItemTree::all_inner_items` r=jonas-schievink a=jonas-schievink
It's unused.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 21 Apr 2021 16:10:25 +0000 (18:10 +0200)]
Remove `ItemTree::all_inner_items`
bors[bot] [Wed, 21 Apr 2021 15:58:57 +0000 (15:58 +0000)]
Merge #8613
8613: skip: Add failing local items test r=jonas-schievink a=jonas-schievink
This is currently broken due to the way ItemTree stores inner items. This test serves as a reminder until this gets fixed.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 21 Apr 2021 15:57:45 +0000 (17:57 +0200)]
Add failing local items test
bors[bot] [Wed, 21 Apr 2021 14:48:03 +0000 (14:48 +0000)]
Merge #8611
8611: Add support for fill match arms of boolean values r=flodiebold a=komonad
- Add support for boolean inside tuple
closes #8593
Co-authored-by: Comonad <comonad@foxmail.com>
unexge [Wed, 21 Apr 2021 13:42:47 +0000 (16:42 +0300)]
Use multiple loops instead of `Iterator::chain` in `FindUsages`
unexge [Wed, 21 Apr 2021 13:20:08 +0000 (16:20 +0300)]
Add multi file test for "Convert to named struct" assist
unexge [Wed, 21 Apr 2021 13:01:13 +0000 (16:01 +0300)]
Remove `unwrap`s in "Convert to named struct" assist
Comonad [Wed, 21 Apr 2021 11:33:45 +0000 (19:33 +0800)]
Add support for fill match arms of boolean values
- Add support for boolean inside tuple
bors[bot] [Wed, 21 Apr 2021 09:12:08 +0000 (09:12 +0000)]
Merge #8609
8609: Parse outer atttributes for RecordPatField r=Veykril a=Veykril
Fixes #8608
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Wed, 21 Apr 2021 09:08:15 +0000 (11:08 +0200)]
Parse outer atttributes for RecordPatField
unexge [Wed, 21 Apr 2021 07:57:36 +0000 (10:57 +0300)]
Add larger example for "Convert to named struct" assist
unexge [Wed, 21 Apr 2021 07:27:26 +0000 (10:27 +0300)]
Fix incorrectly replacing method calls in "Convert to named struct" assist
bors[bot] [Tue, 20 Apr 2021 21:25:27 +0000 (21:25 +0000)]
Merge #8606
8606: fix: no more Registering progress handler for token rustAnalyzer/Ind… r=jonas-schievink a=matklad
…exing failed.
closes #8509
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 20 Apr 2021 19:54:05 +0000 (22:54 +0300)]
fix: no more Registering progress handler for token rustAnalyzer/Indexing failed.
Lukas Wirth [Tue, 20 Apr 2021 17:28:18 +0000 (19:28 +0200)]
Add cov_marks to insert_use tests
Laurențiu Nicola [Mon, 29 Mar 2021 05:55:43 +0000 (08:55 +0300)]
Automatically categorize the changelog entries