aboutsummaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
* Merge #7115bors[bot]2021-01-0320-225/+239
|\ | | | | | | | | | | | | | | | | | | | | | | | | 7115: Migrate HasSource::source to return Option r=matklad a=nick96 I've made a start on fixing #6913 based on the provided work plan, migrating `HasSource::source` to return an `Option`. The simple cases are migrated but there are a few that I'm unsure exactly how they should be handled: - Logging the processing of functions in `AnalysisStatsCmd::run`: In verbose mode it includes the path to the module containing the function and the syntax range. I've handled this with an if-let but would it be better to blow up here with `expect`? I'm not 100% on the code paths but if we're processing a function definition then the source should exist. I've handled `source()` in all code paths as `None` being a valid return value but are there some cases where we should just blow up? Also, all I've done is bubble up the returned `None`s, there may be some places where we can recover and still provide something. Co-authored-by: Nick Spain <[email protected]> Co-authored-by: Nick Spain <[email protected]>
| * Fix ConstParam HasSource impl and implement TryToNav not NavNick Spain2021-01-022-8/+8
| |
| * Remove old_source now we've fully migratedNick Spain2021-01-021-68/+0
| | | | | | | | Fixes #6913
| * Handle case where detail doesn't exist without giving up on completionNick Spain2021-01-021-1/+1
| | | | | | Co-authored-by: Aleksey Kladov <[email protected]>
| * Remove source_old from adding const and function implsNick Spain2021-01-021-23/+26
| |
| * Make the result of Const, FunctionRender and TypeAliasRender constructors ↵Nick Spain2021-01-025-20/+17
| | | | | | | | | | | | optional They use source() which now returns an Option so they need to too.
| * Move impls of ToNav that use source() to TryToNavNick Spain2021-01-025-69/+64
| |
| * Handle missing source in target_data_for_defNick Spain2021-01-021-13/+12
| |
| * Handle missing source in filter_assoc_itemsNick Spain2021-01-021-7/+8
| |
| * Go back to use of source_old() in offset_target_and_file_id as it's not as ↵Nick Spain2021-01-021-1/+2
| | | | | | | | simple as I thought
| * Fix type error with .and_thenNick Spain2021-01-021-15/+14
| |
| * Handle not finding range in Definition::search_scopeNick Spain2021-01-021-12/+36
| | | | | | | | | | | | The `LifetimeParam` and `Local` variants use `source()` to find their range. Now that `source()` returns an `Option` we need to handle the `None` case.
| * source_old -> source for cases that can be handled by simple bubblingNick Spain2021-01-025-13/+10
| |
| * Only log path and syntax range when processing function if source existsNick Spain2021-01-021-6/+6
| |
| * HasSource::source_old -> HasSource::source for places where proc-macros were ↵Nick Spain2021-01-024-42/+11
| | | | | | | | | | | | | | | | | | | | | | | | special cased In #6901 some special case handling for proc-macros was introduced to prevent panicing as they have no AST. Now the new HasSource::source method is used that returns an option. Generally this was a pretty trivial change, the only thing of much interest is that `hir::MacroDef` now implements `TryToNav` not `ToNav` as this allows us to handle `HasSource::source` now returning an option.
| * Mark HasSource::source_old as deprecated but allow at all call sitesNick Spain2021-01-0215-4/+35
| |
| * Implement new HasSource::source for all implementors of HasSourceNick Spain2021-01-021-0/+66
| |
| * HasSource::source -> HasSource::source_oldNick Spain2021-01-0215-55/+55
| | | | | | | | To start migrating HasSource::source to return an Option.
* | Merge #7128bors[bot]2021-01-035-18/+86
|\ \ | | | | | | | | | | | | | | | | | | | | | 7128: Implement HasAttrs for GenericParam r=matklad a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
| * | Implement HasAttrs for Type-, Const- and LifetimeParamLukas Wirth2021-01-021-9/+10
| | |
| * | Impl HasAttrs for GenericParamLukas Wirth2021-01-015-11/+78
| |/
* | Use fully qualified `Itertools::intersperse` call to silence nightly ↵cynecx2021-01-021-8/+7
| | | | | | | | warnings about a potential name collision due to recent libstd api additions
* | Fix warnings on rust-nightlycynecx2021-01-023-4/+4
| |
* | Merge #7133bors[bot]2021-01-027-52/+176
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7133: Proper handling $crate and local_inner_macros r=jonas-schievink a=edwin0cheng This PR introduces `HygineFrames` to store the macro definition/call site hierarchy in hyginee and when resolving `local_inner_macros` and `$crate`, we use the token to look up the corresponding frame and return the correct value. See also: https://rustc-dev-guide.rust-lang.org/macro-expansion.html#hygiene-and-hierarchies fixe #6890 and #6788 r? @jonas-schievink Co-authored-by: Edwin Cheng <[email protected]>
| * | Use arena instead of vecEdwin Cheng2021-01-021-22/+16
| | |
| * | Introduce HygieneFrames for proper token hygineeEdwin Cheng2021-01-027-52/+182
| | |
* | | Merge #7130bors[bot]2021-01-023-0/+356
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7130: Add extract_assignment assist r=Jesse-Bakker a=Jesse-Bakker Add extract-assignment assist (#7006). Assist is for now only implemented on if/match-statements where the assigment is the last statement in every block, as for other cases, one would have to check whether the assignment has effects on the rest of the block and extract a temporary variable for it in the block. Co-authored-by: Jesse Bakker <[email protected]>
| * | | Add support for MatchExpr to extract_assigment assistJesse Bakker2021-01-021-7/+94
| | | |
| * | | Add extract-assignment assistJesse Bakker2021-01-023-0/+269
| | | |
* | | | Merge #7134bors[bot]2021-01-022-1/+19
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7134: Fix infer error of macro invocation in array expr r=edwin0cheng a=edwin0cheng Fixed following infer error: ```rust macro_rules! bar { () => {0u32} } fn test() { let a = [bar!()]; // a : [unknown] } ``` bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * | | Fix infer error of macro invocation in array exprEdwin Cheng2021-01-022-1/+19
| | |/ | |/|
* | | Don't emit arg count diagnostics for method calls with unknown receiverFlorian Diebold2021-01-012-1/+29
| | | | | | | | | | | | Fixes #7098.
* | | Formatting.Mara Bos2021-01-012-4/+22
| | |
* | | Add support for Rust 2021.Mara Bos2021-01-015-5/+11
| |/ |/|
* | Show lifetimes and labels on hoverLukas Wirth2021-01-011-7/+43
| |
* | Merge #7080bors[bot]2021-01-0128-41/+238
|\ \ | |/ |/| | | | | | | | | | | 7080: Implement ConstParams for HIR r=Veykril a=Veykril r? @flodiebold Co-authored-by: Lukas Wirth <[email protected]>
| * Add ConstParams to the ide layerLukas Wirth2021-01-0113-5/+66
| |
| * Add ConstParams to the HIRLukas Wirth2021-01-0116-37/+173
| |
* | Merge #7116bors[bot]2021-01-012-4/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7116: Fix deep syntax tree bug generated by proc-macro r=jonas-schievink a=edwin0cheng This PR fixed a bug from `semver-parser` and `pest_derive` crates which generate a very deep syntax tree such that serde reject to de-serialize. To fix this bug, we disabled recursion limit in `serde` (by calling [`Deserializer::disable_recursion_limit`](https://docs.rs/serde_json/1.0.61/serde_json/struct.Deserializer.html#method.disable_recursion_limit)) I have a feeling that we still need some way to protect against bad proc-macro generating huge syntax node, but I have no idea right now. r? @jonas-schievink Fixes #7103 Co-authored-by: Edwin Cheng <[email protected]>
| * | Remove serde_stacker which depends on ccEdwin Cheng2021-01-012-3/+1
| | |
| * | Fix deep syntax tree bug generated by proc-macroEdwin Cheng2021-01-013-4/+13
| | |
* | | Merge #7102bors[bot]2021-01-011-2/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7102: Fix completion of Default struct update syntax r=Veykril a=nick96 Previously the inserted text was always `..Default::default()` which ends up as `...Default::default()` if `.` was typed. Now checks if the current token is `.` and inserts `.Default::default()` if it is, so `..Default::default()` is correctly completed. I think there's probably a better way to implement this context aware completion because I've seen it in other parts of rust-analyzer as a user but I'm not sure how to do it. Fixes #6969 Co-authored-by: Nick Spain <[email protected]>
| * | | Strip completion prefix of what has already been typedNick Spain2021-01-011-5/+4
| | | | | | | | | | | | | | | | | | | | Per Veykril's suggestion, this removes the need to repeat the completion text twice. It also handles the completion in a more general case.
| * | | Add a test for correct completion of ..Default::default()Nick Spain2021-01-011-1/+61
| | | |
| * | | Fix completion of Default struct update syntaxNick Spain2020-12-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the inserted text was always `..Default::default()` which ends up as `...Default::default()` if `.` was typed. Now checks if the current token is `.` and inserts `.Default::default()` if it is, so `..Default::default()` is correctly completed. Fixes #6969
* | | | Merge #7071bors[bot]2020-12-311-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7071: Pass --all-targets to "cargo check" when discovering external resources r=matklad a=WasabiFan There is a repro case and background in the linked issue. In short, the goal of this MR is to allow rust-analyzer to discover proc-macros which come from your tests (including, most importantly, dev-dependencies). By default, `cargo check` implies the equivalent of `--lib --bins`, meaning it'll check your libraries and binaries -- but not tests! This means proc-macros (or, I guess, build scripts as well) weren't discovered by rust-analyzer if they came from tests. One solution would be to manually add `--lib --bins --tests` (i.e., just augment the effective options to include tests). However, in this MR, I threw in `--all-targets`, which [according to the docs](https://doc.rust-lang.org/cargo/commands/cargo-check.html#target-selection) implies `--benches --examples` too. I have absolutely no idea what repercussions that will have on rust-analyzer for other projects, nor do I know if it's a problem that build scripts will now be discovered for tests/examples/benches. But I am not aware of a reason you _wouldn't_ want to discover these things in your examples too. I think the main drawback of this change is that it will likely slow down the `cargo check`. At a minimum, it'll now be checking your tests _and_ their dependencies. The `cargo check` docs also say that including `--tests` as I have here may cause your lib crate to be built _twice_, once for the normal target and again for unit tests. My reading of that caveat suggests that "building twice" means it's built once for the tests _inside_ your lib, with a test profile, and again for any consumers of your lib, now using a normal release profile or similar. This doesn't seem surprising. Very minor caveat: `--tests` will not include tests within a binary if it has `test = false` set in `Cargo.toml`. (I discovered this manually by trial-and-error, but hey, it actually says that in the docs!) This is likely not an issue, but _does_ mean that if you are -- for whatever reason -- disabling tests like that and then manually specifying `cargo test --package <...> --bin <...>` to run them, rust-analyzer will remain unaware of proc-macros in your tests. I have confirmed this fixes the original issue in my sandbox example linked in #7034 and in my own project in which I originally discovered this. I've left it configured as my default RA language server and will report back if I notice any unexpected side-effects. Fixes #7034 Co-authored-by: Kaelin Laundry <[email protected]>
| * | | | Pass --all-targets to "cargo check"Kaelin Laundry2020-12-291-0/+5
| | |_|/ | |/| |
* | | | Merge #7106bors[bot]2020-12-315-23/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7106: Split textDocument/formatting TextEdit with diff r=matklad a=Jesse-Bakker #7044 Co-authored-by: Jesse Bakker <[email protected]>
| * | | | Split textDocument/formatting TextEdit with diffJesse Bakker2020-12-315-23/+75
| | | | |
* | | | | add working dir to cargo metadata fail messageslf-2020-12-311-1/+17
| | | | |