]>
git.lizzy.rs Git - rust.git/log
Mikhail Rakhmanov [Wed, 3 Jun 2020 16:39:01 +0000 (18:39 +0200)]
Fix review comments
Mikhail Rakhmanov [Tue, 2 Jun 2020 21:22:45 +0000 (23:22 +0200)]
Merge remote-tracking branch 'upstream/master' into compute-lazy-assits
# Conflicts:
# crates/rust-analyzer/src/to_proto.rs
Mikhail Rakhmanov [Tue, 2 Jun 2020 20:21:48 +0000 (22:21 +0200)]
Preliminary implementation of lazy CodeAssits
bors[bot] [Tue, 2 Jun 2020 20:44:56 +0000 (20:44 +0000)]
Merge #4710
4710: New runnables r=matklad a=matklad
bors d=@vsrs
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
bors[bot] [Tue, 2 Jun 2020 16:16:38 +0000 (16:16 +0000)]
Merge #4711
4711: Disable rust-analyzer.{cargo,checkOnSave}.allFeatures by default r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Tue, 2 Jun 2020 09:24:33 +0000 (12:24 +0300)]
Disable rust-analyzer.{cargo,checkOnSave}.allFeatures by default
Aleksey Kladov [Tue, 2 Jun 2020 16:02:58 +0000 (18:02 +0200)]
Fix tests
Aleksey Kladov [Tue, 2 Jun 2020 15:34:18 +0000 (17:34 +0200)]
Spec better runnables
Aleksey Kladov [Tue, 2 Jun 2020 15:22:23 +0000 (17:22 +0200)]
New runnables API
bors[bot] [Tue, 2 Jun 2020 14:31:10 +0000 (14:31 +0000)]
Merge #4709
4709: Minor r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 2 Jun 2020 14:30:26 +0000 (16:30 +0200)]
Minor
bors[bot] [Tue, 2 Jun 2020 12:53:24 +0000 (12:53 +0000)]
Merge #4708
4708: Move run commands to commands.ts r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 2 Jun 2020 12:33:47 +0000 (14:33 +0200)]
Move run commands to commands.ts
bors[bot] [Tue, 2 Jun 2020 12:13:02 +0000 (12:13 +0000)]
Merge #4658
4658: Fix problem with format string tokenization r=matklad a=ruabmbua
Fixed by just not handling closing curlybrace escaping.
Closes https://github.com/rust-analyzer/rust-analyzer/issues/4637
Co-authored-by: Roland Ruckerbauer <roland.rucky@gmail.com>
bors[bot] [Tue, 2 Jun 2020 11:58:28 +0000 (11:58 +0000)]
Merge #4580
4580: Fix invoking cargo without consulting CARGO env var or standard installation paths r=matklad a=Veetaha
Followup for #4329
The pr essentially fixes [this bug](https://youtu.be/EzQ7YIIo1rY?t=2189)
cc @lefticus
Co-authored-by: veetaha <veetaha2@gmail.com>
bors[bot] [Tue, 2 Jun 2020 01:19:58 +0000 (01:19 +0000)]
Merge #4701
4701: Simplify r=kjeremy a=Veetaha
Co-authored-by: veetaha <veetaha2@gmail.com>
veetaha [Mon, 1 Jun 2020 23:50:05 +0000 (02:50 +0300)]
Simplify
bors[bot] [Mon, 1 Jun 2020 15:51:46 +0000 (15:51 +0000)]
Merge #4688
4688: Document initilizationOptions used by rust-analyzer r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 1 Jun 2020 15:51:15 +0000 (17:51 +0200)]
Subscribe to protocol changes
Aleksey Kladov [Mon, 1 Jun 2020 15:42:46 +0000 (17:42 +0200)]
Document initilizationOptions used by rust-analyzer
bors[bot] [Mon, 1 Jun 2020 15:29:52 +0000 (15:29 +0000)]
Merge #4686
4686: Drop unused document r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 1 Jun 2020 15:29:24 +0000 (17:29 +0200)]
Drop unused document
bors[bot] [Mon, 1 Jun 2020 13:41:41 +0000 (13:41 +0000)]
Merge #4682
4682: Rename assist r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 1 Jun 2020 13:36:51 +0000 (15:36 +0200)]
Rename assist
Aleksey Kladov [Mon, 1 Jun 2020 13:35:02 +0000 (15:35 +0200)]
Cleanup imports
bors[bot] [Sun, 31 May 2020 21:09:24 +0000 (21:09 +0000)]
Merge #4675
4675: Small refactor r=kiljacken a=Veetaha
Co-authored-by: veetaha <veetaha2@gmail.com>
veetaha [Sun, 31 May 2020 18:39:19 +0000 (21:39 +0300)]
Small refactor
bors[bot] [Sun, 31 May 2020 17:07:37 +0000 (17:07 +0000)]
Merge #4674
4674: Recursively search submodules to find modules in which a definition is visible. r=matklad a=umanwizard
Co-authored-by: Brennan Vincent <brennan@materialize.io>
bors[bot] [Sun, 31 May 2020 16:58:57 +0000 (16:58 +0000)]
Merge #4669
4669: Always derive from `process.env` when spawning a child process/shell execution r=matklad a=Dfinity-Alin
This is useful when an extension (e.g. [Nix Environment Selector](https://marketplace.visualstudio.com/items?itemName=arrterian.nix-env-selector)) or [launch
configuration](https://stackoverflow.com/questions/
57641460 /set-env-var-for-node-js-when-launching-through-vs-code) sets one or more environment variables.
When `env` is not explicitly specified in the options passed to
`child_process.spawn()` or `vscode.ShellExecution()`, then `process.env` gets
applied automatically. But when an explicit `env` is set, it should inherit from
`process.env` rather than replace it completely.
Co-authored-by: Alin Sinpalean <alin.sinpalean@dfinity.org>
Brennan Vincent [Sun, 31 May 2020 16:21:45 +0000 (12:21 -0400)]
add test
Brennan Vincent [Sun, 31 May 2020 16:01:49 +0000 (12:01 -0400)]
recursively search submodules
bors[bot] [Sun, 31 May 2020 15:48:33 +0000 (15:48 +0000)]
Merge #4673
4673: Update deps r=kjeremy a=kjeremy
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
Jeremy Kolb [Sun, 31 May 2020 15:38:09 +0000 (11:38 -0400)]
Update deps
bors[bot] [Sun, 31 May 2020 13:36:52 +0000 (13:36 +0000)]
Merge #4672
4672: Link docs and code r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 31 May 2020 13:36:20 +0000 (15:36 +0200)]
Link to the specific source line
bors[bot] [Sun, 31 May 2020 13:20:52 +0000 (13:20 +0000)]
Merge #4671
4671: docs r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 31 May 2020 13:15:03 +0000 (15:15 +0200)]
docs
bors[bot] [Sun, 31 May 2020 13:03:55 +0000 (13:03 +0000)]
Merge #4670
4670: Move assists documentation into the manual r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 31 May 2020 13:02:12 +0000 (15:02 +0200)]
Move assists documentation into the manual
bors[bot] [Sun, 31 May 2020 12:03:24 +0000 (12:03 +0000)]
Merge #4667
4667: Infer labelled breaks correctly r=flodiebold a=robojumper
Fixes #4663.
Co-authored-by: robojumper <robojumper@gmail.com>
Alin Sinpalean [Sun, 31 May 2020 11:41:52 +0000 (13:41 +0200)]
Always derive from `process.env` when spawning a child process/shell execution
This is useful when an extension (e.g. Nix Environment Selector) or launch
configuration sets one or more environment variables.
When `env` is not explicitly specified in the options passed to
`child_process.spawn()` or `vscode.ShellExecution()`, then `process.env` gets
applied automatically. But when an explicit `env` is set, it should inherit from
`process.env` rather than replace it completely.
bors[bot] [Sun, 31 May 2020 11:22:40 +0000 (11:22 +0000)]
Merge #4668
4668: Rename user/readme.adoc -> user/manual.adoc r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 31 May 2020 11:22:02 +0000 (13:22 +0200)]
Rename user/readme.adoc -> user/manual.adoc
bors[bot] [Sun, 31 May 2020 10:50:11 +0000 (10:50 +0000)]
Merge #4664
4664: Generate feature documentation from code r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sun, 31 May 2020 10:49:06 +0000 (12:49 +0200)]
Force / slashes on windows
Aleksey Kladov [Sun, 31 May 2020 10:12:41 +0000 (12:12 +0200)]
Tweak whitespace
robojumper [Sun, 31 May 2020 10:06:22 +0000 (12:06 +0200)]
fmt
robojumper [Sun, 31 May 2020 08:59:40 +0000 (10:59 +0200)]
correctly infer labelled breaks
Aleksey Kladov [Sun, 31 May 2020 09:29:19 +0000 (11:29 +0200)]
Move the rest of the features to generated docs
robojumper [Sat, 30 May 2020 00:06:58 +0000 (02:06 +0200)]
labelled break test
Aleksey Kladov [Sun, 31 May 2020 08:14:36 +0000 (10:14 +0200)]
Doc more features
Aleksey Kladov [Sun, 31 May 2020 07:59:38 +0000 (09:59 +0200)]
Don't require module docs for Features and Assists
Aleksey Kladov [Sun, 31 May 2020 07:45:41 +0000 (09:45 +0200)]
Specify actions
Aleksey Kladov [Sun, 31 May 2020 07:29:15 +0000 (09:29 +0200)]
Ignore HTML
Aleksey Kladov [Sun, 31 May 2020 07:28:53 +0000 (09:28 +0200)]
Simplify
veetaha [Sun, 31 May 2020 02:13:08 +0000 (05:13 +0300)]
Change Runnable.bin -> Runnable.kind
As per matklad, we now pass the responsibility for finding the binary to the frontend.
Also, added caching for finding the binary path to reduce
the amount of filesystem interactions.
veetaha [Sat, 23 May 2020 13:31:56 +0000 (16:31 +0300)]
Fix tests, apply code review proposals
veetaha [Sat, 23 May 2020 01:58:22 +0000 (04:58 +0300)]
Fix invoking cargo without consulting CARGO or standard installation paths
Aleksey Kladov [Sat, 30 May 2020 23:54:54 +0000 (01:54 +0200)]
Generate features docs from source
Aleksey Kladov [Sat, 30 May 2020 22:33:37 +0000 (00:33 +0200)]
Generalize
bors[bot] [Sat, 30 May 2020 22:00:07 +0000 (22:00 +0000)]
Merge #4662
4662: minor r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 30 May 2020 21:57:16 +0000 (23:57 +0200)]
minor
Roland Ruckerbauer [Sat, 30 May 2020 16:35:11 +0000 (18:35 +0200)]
Test case for format string highlighting of closing curlybrace
Roland Ruckerbauer [Sat, 30 May 2020 12:09:10 +0000 (14:09 +0200)]
Fix problem with format string tokenization
Fixed by just not handling closing curlybrace escaping.
bors[bot] [Sat, 30 May 2020 08:26:04 +0000 (08:26 +0000)]
Merge #4654
4654: Add semantic highlight to ? operator r=matklad a=ruabmbua
Made it an operator with controlFlow modifier.
To highlight in vscode as red:
```json
"editor.semanticTokenColorCustomizations": {
"enabled": true,
"rules": {
"operator.controlFlow": "#ff0000",
}
}
```
![Bildschirmfoto von 2020-05-29 21-32-06](https://user-images.githubusercontent.com/
2522373 /
83297998 -
f3585a00 -a1f3-11ea-9d14-
4ef04b9b6b9a .png)
https://github.com/rust-analyzer/rust-analyzer/issues/4597
Co-authored-by: Roland Ruckerbauer <roland.rucky@gmail.com>
bors[bot] [Sat, 30 May 2020 08:01:00 +0000 (08:01 +0000)]
Merge #4562
4562: Assist: replace anonymous lifetime with a named one r=matklad a=jbalint
(fixes #4523)
Co-authored-by: Jess Balint <jbalint@gmail.com>
bors[bot] [Sat, 30 May 2020 07:52:07 +0000 (07:52 +0000)]
Merge #4653
4653: Fix match ergonomics in closure parameters r=matklad a=flodiebold
Fixes #4476.
Co-authored-by: Florian Diebold <florian.diebold@freiheit.com>
bors[bot] [Sat, 30 May 2020 04:51:26 +0000 (04:51 +0000)]
Merge #4655
4655: Fix typo in docs/dev/lsp-extensions.md: automagiacally -> automagically r=kjeremy a=theHamsta
This may be a typo...
Co-authored-by: Stephan Seitz <stephan.seitz@fau.de>
Stephan Seitz [Fri, 29 May 2020 21:41:04 +0000 (23:41 +0200)]
Fix typo in docs/dev/lsp-extensions.md: automagiacally -> automagically
bors[bot] [Fri, 29 May 2020 21:07:43 +0000 (21:07 +0000)]
Merge #4651
4651: Use first match branch in case of type mismatch, not last r=kjeremy a=flodiebold
The comment says this was intentional, but I do agree with #4304 that it makes
more sense the other way around (for if/else as well).
Fixes #4304.
Co-authored-by: Florian Diebold <florian.diebold@freiheit.com>
bors[bot] [Fri, 29 May 2020 19:33:52 +0000 (19:33 +0000)]
Merge #4652
4652: Upgrade Chalk r=kjeremy a=flodiebold
Fixes #4072.
Co-authored-by: Florian Diebold <florian.diebold@freiheit.com>
Roland Ruckerbauer [Fri, 29 May 2020 19:17:14 +0000 (21:17 +0200)]
Add semantic highlight to QUESTION token
Made it an operator with controlFlow modifier.
Florian Diebold [Fri, 29 May 2020 15:35:57 +0000 (17:35 +0200)]
Fix match ergonomics in closure parameters
Fixes #4476.
bors[bot] [Fri, 29 May 2020 15:04:35 +0000 (15:04 +0000)]
Merge #4648
4648: Support raw_ref_op's raw reference operator r=matklad a=robojumper
Fixes #4642.
This syntax (and its semantics) are implemented in rustc behind the `raw_ref_op` feature.
It is not entirely clear whether this is the syntax that will become stable, but [it seems like](https://github.com/rust-lang/rust/pull/72279) rust-analyzer must still support this unstable syntax to support future stable rust.
Also fixes a random inference failure involving a direct coercion from `&[T, _]` to `*const [T]`.
Co-authored-by: robojumper <robojumper@gmail.com>
Florian Diebold [Fri, 29 May 2020 14:49:52 +0000 (16:49 +0200)]
Upgrade Chalk
Fixes #4072.
Florian Diebold [Fri, 29 May 2020 14:03:06 +0000 (16:03 +0200)]
Use first match branch in case of type mismatch, not last
The comment says this was intentional, but I do agree with #4304 that it makes
more sense the other way around (for if/else as well).
Fixes #4304.
Jess Balint [Thu, 28 May 2020 19:20:26 +0000 (14:20 -0500)]
add support for naming anon lifetimes in function return type
robojumper [Thu, 28 May 2020 19:42:22 +0000 (21:42 +0200)]
Support raw_ref_op's raw reference operator
bors[bot] [Thu, 28 May 2020 13:37:37 +0000 (13:37 +0000)]
Merge #4640
4640: Add `inRustProject` when-clause for commands in vscode r=vsrs a=vsrs
At the moment all rust-analyzer commands always visible in the command palette, even if there is no rust project opened.
This PR adds special [when-clause](https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts) context. This context also might be used in key bindings.
Co-authored-by: vsrs <vit@conrlab.com>
Co-authored-by: vsrs <62505555+vsrs@users.noreply.github.com>
vsrs [Thu, 28 May 2020 13:04:42 +0000 (16:04 +0300)]
Add `inRustProject` context documentation.
bors[bot] [Thu, 28 May 2020 09:34:33 +0000 (09:34 +0000)]
Merge #4641
4641: Upgrade Chalk r=matklad a=flodiebold
Chalk newly added TypeName::Never and Array; I implemented the conversion for
Never, but not Array since that expects a const argument.
Co-authored-by: Florian Diebold <flodiebold@gmail.com>
bors[bot] [Thu, 28 May 2020 08:20:43 +0000 (08:20 +0000)]
Merge #4646
4646: Link forum topic r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Thu, 28 May 2020 08:19:01 +0000 (10:19 +0200)]
Link forum topic
bors[bot] [Wed, 27 May 2020 19:14:11 +0000 (19:14 +0000)]
Merge #4639
4639: Fixed missing newline on each field on "Missing structure fields". r=flodiebold a=flipbit03
Co-authored-by: Cadu <cadu.coelho@gmail.com>
Florian Diebold [Wed, 27 May 2020 19:05:21 +0000 (21:05 +0200)]
Upgrade Chalk
Chalk newly added TypeName::Never and Array; I implemented the conversion for
Never, but not Array since that expects a const argument.
vsrs [Wed, 27 May 2020 16:40:13 +0000 (19:40 +0300)]
Add `inRustProject` when-clause for commands.
Cadu [Wed, 27 May 2020 16:15:19 +0000 (13:15 -0300)]
Fixed missing newline on each field on "Missing structure fields".
bors[bot] [Wed, 27 May 2020 13:22:26 +0000 (13:22 +0000)]
Merge #4592
4592: fix textedit range returned for completion when left token is a keyword r=bnjjj a=bnjjj
close #4545
Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
Benjamin Coenen [Wed, 27 May 2020 13:15:19 +0000 (15:15 +0200)]
fix textedit range returned for completion when left token is a keyword
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
bors[bot] [Wed, 27 May 2020 12:41:38 +0000 (12:41 +0000)]
Merge #4596
4596: Strip leading underscores of argument names in function/method r=matklad a=kuy
Closes #4510
### Goal
When I select a function/method from completions, I get a snippet that doesn't contain leading underscores of argument names.
### Solution
- Option 1: All signatures don't contain underscores
- Option 2: Keep same signature, but inserted snippet doesn't contain underscores
I choose Option 2 because I think that leading underscores is a part of "signature". Users should get correct signatures. On the other hand, trimming underscores is an assist by IDE.
### Other impls.
rls: Complete argument names with underscores (same as actual ra)
IntelliJ Rust: Doesn't complete argument names
VSCode (TypeScript): Doesn't complete argument names
### Working example
![Screen Shot 2020-05-25 at 0 03 21](https://user-images.githubusercontent.com/151614/
82757771 -
a05e5b80 -9e1d-11ea-9dbc-
1263c960e2ae .png)
Co-authored-by: Yuki Kodama <endflow.net@gmail.com>
bors[bot] [Wed, 27 May 2020 12:34:03 +0000 (12:34 +0000)]
Merge #4625 #4629
4625: Partially fix displaying inlay hints in Github PR diff views r=matklad a=Veetaha
See the comment in https://github.com/rust-analyzer/rust-analyzer/issues/4608#issuecomment-
63424257
It partially fixes the left side of diff view (the one where old code is displayed), but the diff editor with new code changes still has `file` scheme and will proceed displaying inlay hints...
4629: Fix the `should_panic` snippet r=matklad a=eminence
Closes #4628
Co-authored-by: veetaha <veetaha2@gmail.com>
Co-authored-by: Andrew Chin <achin@eminence32.net>
bors[bot] [Wed, 27 May 2020 12:25:20 +0000 (12:25 +0000)]
Merge #4633
4633: typo r=matklad a=Veetaha
Co-authored-by: Veetaha <veetaha2@gmail.com>
Veetaha [Wed, 27 May 2020 11:04:57 +0000 (14:04 +0300)]
typo
bors[bot] [Wed, 27 May 2020 10:21:31 +0000 (10:21 +0000)]
Merge #4632
4632: Document inlay hints and runnables r=matklad a=matklad
We want to change those, but let's document what we have in meantime
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Wed, 27 May 2020 10:20:47 +0000 (12:20 +0200)]
Document inlay hints and runnables
We want to change those, but let's document what we have in meantime
bors[bot] [Wed, 27 May 2020 06:42:04 +0000 (06:42 +0000)]
Merge #4622
4622: Pass trivially copy types as copy r=matklad a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
Andrew Chin [Tue, 26 May 2020 22:45:14 +0000 (18:45 -0400)]
Fix the `should_panic` snippet
Closes #4628
veetaha [Tue, 26 May 2020 19:51:04 +0000 (22:51 +0300)]
Partially fix displaying inlay hints in Github PR diff views
bors[bot] [Tue, 26 May 2020 19:23:53 +0000 (19:23 +0000)]
Merge #4623
4623: Update deps r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Tue, 26 May 2020 18:35:09 +0000 (14:35 -0400)]
Update lexer