bors[bot]
ab53bb8718
Merge #6320 #6321
...
6320: Textmate grammar: prevent line comments from breaking block comments (closes #6281 ) r=matklad a=dustypomerleau
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6281 .
Previously, line comments were able to break block comments by essentially commenting out the closing `*/`, resulting in a never-ending comment. This PR splits block comments into a separate repository group to fix this problem.
Since the comment scopes also include ignored parameters and inferred types, I've added the change proposed by @bnjjj in https://github.com/rust-analyzer/rust-analyzer/pull/6317 , in order to close https://github.com/rust-analyzer/rust-analyzer/issues/6311 as well.
6321: Fix opening module documentation opening parent documentation instead r=matklad a=zacps
The whole path/URL joining code is kind of ugly which is what led to
this, but at the same time I don't really want to rewrite it right
now...
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6286
Co-authored-by: Dusty Pomerleau <dustypomerleau@users.noreply.github.com >
Co-authored-by: Zac Pullar-Strecker <zacmps@gmail.com >
2020-10-22 12:04:50 +00:00
bors[bot]
af75a08116
Merge #6314
...
6314: generate assist respect cfg attributes r=matklad a=bnjjj
close #6312
Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
2020-10-22 11:58:11 +00:00
Benjamin Coenen
f1fda43485
generate_impl assist respect cfg attributes #6312
...
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
2020-10-22 09:48:48 +02:00
Zac Pullar-Strecker
68c67efa68
Fix opening module documentation opening parent documentation instead
...
The whole path/URL joining code is kind of ugly which is what led to
this, but at the same time I don't really want to rewrite it right
now...
2020-10-22 17:33:52 +13:00
Dusty Pomerleau
26b4b1e2fb
fix: prevent line comments inside block comments
...
- prevent line comments inside block comments
- prevent underscore-prefixed functions and macros from receiving comment scope
2020-10-22 13:33:06 +11:00
bors[bot]
9eb6cbb80b
Merge #6307
...
6307: Add whitelist of safe intrinsics r=frazar a=frazar
This PR should fix #5996 , where intrinsic operations where all marked as unsafe.
I'm rather new to this codebase, so I might be doing something *very* wrong. Please forgive me!
In particular, I'm not sure how to "check that we are in extern `rust-intrinsics`" as mentioned [in this comment](https://github.com/rust-analyzer/rust-analyzer/issues/5996#issuecomment-709234802 ).
Co-authored-by: Francesco Zardi <frazar@users.noreply.github.com >
2020-10-21 20:09:11 +00:00
Francesco Zardi
aff04d81ba
Refactor is_intrinsic_fn_unsafe() and make it private
2020-10-21 21:53:37 +02:00
Francesco Zardi
0be21b05d6
Move safe intrinsic tests
2020-10-21 21:53:05 +02:00
Francesco Zardi
f3aa44b01d
Fix typo in comment
2020-10-21 21:51:53 +02:00
bors[bot]
cc63f153f0
Merge #6302
...
6302: Textmate grammar: fix raw string highlighting r=matklad a=dustypomerleau
1. Fixes the raw string highlighting issue noted by @matklad in https://github.com/rust-analyzer/rust-analyzer/pull/6275 .
2. Improves raw string highlighting by requiring the number of surrounding `#` to match.
Co-authored-by: Dusty Pomerleau <dustypomerleau@users.noreply.github.com >
2020-10-21 08:39:03 +00:00
Francesco Zardi
a9d996a7c5
Add whitelist of safe intrinsics
2020-10-21 09:06:05 +02:00
Dusty Pomerleau
93eeafc79f
fix: require matching hash quantities for raw strings
2020-10-21 10:38:31 +11:00
bors[bot]
729a832a76
Merge #6270
...
6270: Update crates r=matklad a=kjeremy
This brings in a number of new dependencies though.
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com >
2020-10-20 22:26:31 +00:00
Jeremy Kolb
f64f569483
Update crates
...
This brings in a number of new dependencies though.
2020-10-20 17:36:02 -04:00
bors[bot]
0833484914
Merge #6259
...
6259: allow xtask install --client[=CLIENT] to specify client r=Emilgardis a=Emilgardis
Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com >
2020-10-20 20:49:17 +00:00
Emil Gardström
c5b1c36b2b
rename flag --client-code to --client on xtask install
2020-10-20 22:37:02 +02:00
bors[bot]
08823c8262
Merge #6109
...
6109: add completions for clippy lint in attributes r=bnjjj a=bnjjj
Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
2020-10-20 19:43:44 +00:00
Benjamin Coenen
aa031e91f4
add completions for clippy lint in attributes
...
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
2020-10-20 21:29:31 +02:00
bors[bot]
c00339509d
Merge #6256
...
6256: Assist: replace string with char r=bnjjj a=bnjjj
close #6252
Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
Co-authored-by: Coenen Benjamin <benjamin.coenen@hotmail.com >
2020-10-20 19:03:25 +00:00
Coenen Benjamin
9883435e4e
Update crates/assists/src/handlers/replace_string_with_char.rs
...
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-20 20:07:39 +02:00
bors[bot]
989de9e309
Merge #6172
...
6172: Add qualify path assist r=matklad a=Veykril
This implements a `qualify_path` assist which works quite similar to the `auto_import` assist but instead of adding imports to the file it well, qualifies the path. This PR also moves out the `AutoImportAssets` struct and functions from `auto_import` into a utils submodule as most of this is now shared between `auto_import` and `qualify_path`.
Changes made to `AutoImportAssets` are solely in its `search_for_imports` function which now takes a prefixed parameter to discern between using `find_use_path_prefixed` and `find_use_path` as the former is the required behavior by `auto_import` and the latter by this assist.
For missing imported traits instead of importing this will qualify the path with a trait cast as in:
```rust
test_mod::TestStruct::TEST_CONST<|>
```
becomes
```rust
<test_mod::TestStruct as test_mod::TestTrait>::TEST_CONST
```
and for trait methods ideally it would do the following:
```rust
let test_struct = test_mod::TestStruct {};
test_struct.test_meth<|>od()
```
becomes
```rust
let test_struct = test_mod::TestStruct {};
test_mod::TestTrait::test_method(&test_struct)
```
Fixes #4124 .
Co-authored-by: Lukas Wirth <lukastw97@gmail.com >
2020-10-20 17:03:19 +00:00
bors[bot]
20d369a826
Merge #6299
...
6299: Diagnose items that are #[cfg]d out r=jonas-schievink a=jonas-schievink
This emits a hint-level diagnostic with `Unnecessary` tag to "gray out" any items whose `#[cfg]` attributes remove the item before name resolution.
Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com >
2020-10-20 16:35:05 +00:00
Jonas Schievink
74ac83a5ac
Fixup botched rename
2020-10-20 18:29:47 +02:00
Jonas Schievink
3fa04f35d2
More detailed message
2020-10-20 18:23:55 +02:00
Jonas Schievink
4cb3cf352f
Rename UnconfiguredCode -> InactiveCode
2020-10-20 18:22:31 +02:00
bors[bot]
5dd99aa016
Merge #6301
...
6301: Don't rely on display names in inlay_hints r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-20 16:14:40 +00:00
Aleksey Kladov
a3a8ad8bc4
Don't rely on display names in inlay_hints
2020-10-20 18:14:14 +02:00
Jonas Schievink
80d2741401
Add a (hint) diagnostic for unconfigured items
2020-10-20 17:53:04 +02:00
Jonas Schievink
a54e481646
Simplify diagnostic construction, add unused field
2020-10-20 17:53:04 +02:00
bors[bot]
f925735e64
Merge #6297
...
6297: Support Display name in project.json r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-20 15:15:58 +00:00
Aleksey Kladov
f753c3ecd2
Support Display name in project.json
2020-10-20 17:13:15 +02:00
bors[bot]
1c24f57ef8
Merge #6295
...
6295: More type safety around names r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-20 15:09:51 +00:00
Aleksey Kladov
3b1a648539
More type safety around names
2020-10-20 17:09:03 +02:00
Aleksey Kladov
a85c4280bf
Introduce CrateDisplayName
2020-10-20 16:00:51 +02:00
Benjamin Coenen
c22c039578
Assist: replace string with char
...
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com >
2020-10-20 15:57:50 +02:00
Aleksey Kladov
af4e75533f
Rename declaration_name -> display_name
...
Declaration names sounds like a name of declaration -- something you
can use for analysis. It empathically isn't, and is just a label
displayed in various UI. It's important not to confuse the two, least
we accidentally mix semantics with UI (I believe, there's already a
case of this in the FamousDefs at least).
2020-10-20 15:38:11 +02:00
bors[bot]
be762ccccd
Merge #6294
...
6294: Add a hacky remidy for #6038 r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-20 10:36:28 +00:00
Aleksey Kladov
7a21e9302e
Add a hacky remidy for #6038
...
The proper fix I think is:
* move rust-lang/rust library crates to a separate workspace
* when packaging rust-src component, vendor sources of external deps
2020-10-20 12:34:39 +02:00
bors[bot]
4c00bdea67
Merge #6266
...
6266: Generate diagnostics docs r=matklad a=popzxc
Resolves #6215
Co-authored-by: Igor Aleksanov <popzxc@yandex.ru >
2020-10-20 09:46:43 +00:00
Igor Aleksanov
b8a74e0370
Add generated_diagnostic.adoc to the release.rs and smoke_test_docs_generation
2020-10-19 21:07:40 +03:00
Igor Aleksanov
aa9be4d523
Use xshell::read_file instead of fs::read_to_string
2020-10-19 20:58:32 +03:00
Igor Aleksanov
2a20e7795c
Add descriptions for diagnostics parseable by xtask
2020-10-19 20:55:16 +03:00
Igor Aleksanov
52b19c39e8
Create xtask module to generate diagnostics docs
2020-10-19 20:55:16 +03:00
bors[bot]
378dd90bab
Merge #6290
...
6290: Fix deprecation warning r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-19 17:06:34 +00:00
Aleksey Kladov
53a7651673
Fix deprecation warning
...
See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
2020-10-19 19:05:55 +02:00
bors[bot]
fc2383e783
Merge #6288
...
6288: Tag release branch rather than master r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-19 16:30:09 +00:00
Aleksey Kladov
895872f076
Tag release branch rather than master
2020-10-19 18:28:59 +02:00
bors[bot]
2c5bd9517e
Merge #6274
...
6274: Check cargoExtraArgs for undefined before using r=matklad a=feileacan
Fixes #6273
Co-authored-by: feileacan <54381366+feileacan@users.noreply.github.com >
2020-10-19 15:35:32 +00:00
bors[bot]
9b656463ce
Merge #6284
...
6284: Document logging of project model r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com >
2020-10-19 14:04:58 +00:00
Aleksey Kladov
a261c7c539
Document logging of project model
2020-10-19 16:04:22 +02:00