aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #6542bors[bot]2020-11-132-2755/+11
|\ | | | | | | | | | | | | | | | | 6542: Revert "Upgrade version of npms lockfile" r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Revert "Upgrade version of npms lockfile"Aleksey Kladov2020-11-132-2755/+11
|/ | | | | | | This reverts commit 3d559afc11b230d52b13c5540706b85a7eeb3490. VS Code uses nodejs 12 still, so its better to stick to the format it understands.
* Merge #6538bors[bot]2020-11-122-11/+2755
|\ | | | | | | | | | | | | | | | | 6538: Upgrade version of npms lockfile r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Upgrade version of npms lockfileAleksey Kladov2020-11-122-11/+2755
|/
* Merge #6524bors[bot]2020-11-125-69/+233
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6524: Add support for loading rustc private crates r=matklad a=xldenis This PR presents a solution to the problem of making`rustc_private` crates visible to `rust-analyzer`. Currently developers add dependencies to those crates behind a `cfg(NOT_A_TARGET)` target to prevent `cargo` from building them. This solution is unsatisfactory since it requires modifying `Cargo.toml` and causes problems for collaboration or CI. The proposed solution suggested by @matklad is to allow users to give RA a path where the `rustc` sources could be found and then load that like a normal workspace. This PR implements this solution by adding a `rustcSource` configuration item and adding the cargo metadata to the crate graph if it is provided. ------ I have no idea how this should be tested, or if this code is generally tested at all. I've locally run the extension with these changes and it correctly loads the relevant crates on a `rustc_private` project of mine. Co-authored-by: Xavier Denis <[email protected]>
| * Address review commentsXavier Denis2020-11-123-3381/+17
| |
| * Reorder rustc_private loadingXavier Denis2020-11-111-87/+86
| |
| * Add support for loading rustc private cratesXavier Denis2020-11-116-79/+3608
| |
* | Merge #6514bors[bot]2020-11-121-28/+92
|\ \ | | | | | | | | | | | | | | | | | | | | | 6514: Fix extract_struct_from_enum_variant not updating record references r=Veykril a=Veykril Related to #6510 Co-authored-by: Lukas Wirth <[email protected]>
| * | Add extra test to extract_struct_from_enum_variantLukas Wirth2020-11-121-1/+28
| | |
| * | Use Module::find_use_path_prefixed in extract_struct_from_enum_variant assistLukas Wirth2020-11-121-5/+9
| | |
| * | Fix extract_struct_from_enum_variant not updating record referencesLukas Wirth2020-11-121-26/+59
| | |
* | | Merge #6513bors[bot]2020-11-121-1/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6513: Support qualified function calls in remove_unused_param r=Veykril a=Veykril Also adds a test to check that it removes unused params across files. Co-authored-by: Lukas Wirth <[email protected]>
| * | | Support qualified function calls in remove_unused_paramLukas Wirth2020-11-121-1/+49
| | | |
| * | | Add multiple file edit tes to remove_unused_param assistLukas Wirth2020-11-091-0/+33
| |/ /
* | | Merge #6529bors[bot]2020-11-121-19/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6529: Do not insert imports before inner comments r=Veykril a=SomeoneToIgnore Co-authored-by: Kirill Bulatov <[email protected]>
| * | | Remove the fixmeKirill Bulatov2020-11-121-36/+15
| | | |
| * | | Add a FIXME for non-unified inner attributesKirill Bulatov2020-11-121-2/+7
| | | |
| * | | Do not insert imports before inner commentsKirill Bulatov2020-11-121-18/+92
|/ / /
* | | Merge #6534bors[bot]2020-11-124-47/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6534: Fix attachment of inner doc comments r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix attachment of inner doc commentsAleksey Kladov2020-11-123-19/+33
| | | |
| * | | Simplify codeAleksey Kladov2020-11-121-28/+23
| | | |
* | | | Merge #6531bors[bot]2020-11-1212-33/+191
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6531: Update crates r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Update testsAleksey Kladov2020-11-1210-21/+168
| | | |
| * | | Update crateskjeremy2020-11-112-12/+23
|/ / /
* | | Merge #6530bors[bot]2020-11-111-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6530: Do not use yanked once_cell r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | | Do not use yanked once_cellkjeremy2020-11-111-2/+2
|/ / /
* | | Merge #6526bors[bot]2020-11-114-34/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6526: Replace RacyFlag with OnceCell r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Replace RacyFlag with OnceCellAleksey Kladov2020-11-114-34/+9
|/ / /
* | | Merge #6523bors[bot]2020-11-101-3/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 6523: Be more pedantic when checking codeAction/resolve support r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Be more pedantic when checking codeAction/resolve supportAleksey Kladov2020-11-101-3/+6
| | |
* | | Merge #6521bors[bot]2020-11-1015-91/+86
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6521: Switch to upstream protocol for resolving code action r=matklad a=matklad Note that we have to maintain custom implementation on the client side: I don't see how to marry bulitin resolve support with groups and snippets. Co-authored-by: Aleksey Kladov <[email protected]>
| * | Switch to upstream protocol for resolving code actionAleksey Kladov2020-11-1015-91/+86
|/ / | | | | | | | | | | Note that we have to maintain custom implementation on the client side: I don't see how to marry bulitin resolve support with groups and snippets.
* | Merge #6512bors[bot]2020-11-091-36/+89
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6512: Don't replace parent node when inserting as first child in algo::diff r=SomeoneToIgnore a=Veykril This makes the diff a bit more detailed. See https://github.com/rust-analyzer/rust-analyzer/pull/6287#issuecomment-723889267 for context cc @SomeoneToIgnore Co-authored-by: Lukas Wirth <[email protected]>
| * | Don't replace parent node when inserting as first child in algo::diffLukas Wirth2020-11-091-36/+89
| | |
* | | Merge #6516bors[bot]2020-11-091-5/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6516: Textmate grammar: prevent `/**/` from matching block doc comments r=dustypomerleau a=dustypomerleau Fixes #6493. Co-authored-by: Dusty Pomerleau <[email protected]>
| * | | fix: prevent `/**/` from matching block doc commentsDusty Pomerleau2020-11-091-5/+10
|/ / /
* | | Merge #6472bors[bot]2020-11-097-3/+95
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6472: Add `static` modifier for associated functions r=matklad a=p3achyjr Adds static semantic token modifier to associated functions, resolves #6194 ## Info - Associated functions are more-or-less equivalent to static methods in other languages. This PR checks, for each function, whether that function has a self_param, and whether it's enclosed in a trait/impl. ## Changes - Added method ```is_associated``` to code_model::Function. This basically gets the source from the ast, and checks whether the enclosing scope is an impl or trait. - Added `static` to HighlightModifiers - Added unit test ## Tests - Ran ```cargo test``` Co-authored-by: Anatol Liu <[email protected]>
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-092-16/+3
| | | | | | | | | | | | | | | | | | refactor logic into code_model.rs address comments
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-082-6/+2
| | | | | | | | | | | | | | | | | | refactor logic into code_model.rs address comments
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-051-5/+1
| | | | | | | | | | | | | | | | | | refactor logic into code_model.rs address comments
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-051-1/+1
| | | | | | | | | | | | refactor logic into code_model.rs
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-052-17/+22
| | | | | | | | | | | | refactor logic into code_model.rs
| * | Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-058-2/+110
| | |
* | | Merge #6511bors[bot]2020-11-095-28/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6511: . is an operator r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | . is an operatorAleksey Kladov2020-11-095-28/+30
|/ / / | | | | | | | | | closes #6498
* | | Merge #6510bors[bot]2020-11-092-3/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6510: Fix panic when extracting struct r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix panic when extracting structAleksey Kladov2020-11-092-3/+34
|/ / /
* | | Merge #6509bors[bot]2020-11-092-6/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6509: Support multi-file assist tests r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Support multi-file assist testsAleksey Kladov2020-11-092-6/+56
| | | |