aboutsummaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
* Refactor TokenStream to hold Vec<TokenTree> instead of tt::SubtreeKevin Mehall2021-03-063-65/+56
| | | | | | | | | | `TokenStream` assumes that its subtree's delimeter is `None`, and this should be encoded in the type system instead of having a delimiter field that is mostly ignored. `tt::Subtree` is just `pub delimiter: Option<Delimiter>, pub token_trees: Vec<TokenTree>`, so a Subtree that is statically guaranteed not to have a delimiter is just Vec<TokenTree>.
* Fix TokenStream::from_str for input consisting of a single GroupKevin Mehall2021-03-061-2/+34
| | | | | | | | | | | | | | | TokenStream holds a `tt::Subtree` but assumes its `delimiter` is always `None`. In particular, the iterator implementation iterates over the inner `token_trees` and ignores the `delimiter`. However, `TokenStream::from_str` violated this assumption when the input consists of a single Group by producing a Subtree with an outer delimiter, which was ignored as seen by a procedural macro. In this case, wrap an extra level of Subtree around it. Fixes #7810 Fixes #7875
* Merge #7887bors[bot]2021-03-052-2/+4
|\ | | | | | | | | | | | | | | | | | | 7887: Fix fail to parse :: for meta in mbe r=edwin0cheng a=edwin0cheng fixes #7886 bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * Fix fail to parse :: for meta in mbeEdwin Cheng2021-03-052-2/+4
| |
* | Merge #7884bors[bot]2021-03-052-39/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 7884: Simplify TokenStream FromStr r=edwin0cheng a=edwin0cheng Make sure `FromStr` ignore all `TokenMap` in all cases. bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * | Fix testEdwin Cheng2021-03-051-1/+1
| | |
| * | Simplify TokenStream FromStrEdwin Cheng2021-03-051-38/+42
| | |
* | | Merge #7869bors[bot]2021-03-051-0/+43
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 7869: Add support for deref assignments to "pull assignment up" assist. r=Veykril a=Jesse-Bakker Fixes #7867 Co-authored-by: Jesse Bakker <[email protected]>
| * | Add support for deref assignments to "pull assignment up" assist.Jesse Bakker2021-03-051-0/+43
| |/ | | | | | | Fixes #7867
* | Make two calls virtualLaurențiu Nicola2021-03-052-2/+2
| |
* | Merge #7880bors[bot]2021-03-051-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 7880: Honor snippet capability when using the extract function assist r=lnicola a=Arthamys This fixes issue #7793 Co-authored-by: san <[email protected]>
| * | Honor snippet capability in extract function assistsan2021-03-051-2/+8
| | |
* | | Merge #7870bors[bot]2021-03-0511-73/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7870: Use chalk_ir::AdtId r=Veykril a=Veykril It's a bit unfortunate that we got two AdtId's now(technically 3 with the alias in the chalk module but that one won't allow pattern matching), one from hir_def and one from chalk_ir(hir_ty). But the hir_ty/chalk one doesn't leave hir so it shouldn't be that bad I suppose. Though if I see this right this will happen for almost all IDs. I imagine most of the intermediate changes to using chalk ids will turn out not too nice until the refactor is over. Co-authored-by: Lukas Wirth <[email protected]>
| * | | Use chalk_ir::AdtIdLukas Wirth2021-03-0411-73/+68
| | |/ | |/|
* / | Fix some warningsLaurențiu Nicola2021-03-052-2/+2
|/ /
* | Merge #7868bors[bot]2021-03-043-8/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7868: Migrate to user-centric config name for `cargo check` stuff r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Migrate to user-centric config name for `cargo check` stuffAleksey Kladov2021-03-043-8/+7
| | |
* | | Complete `while let`Lukas Wirth2021-03-032-9/+11
| | |
* | | Don't complete `super` unless its valid in pathsLukas Wirth2021-03-033-23/+34
| | |
* | | Merge #7863bors[bot]2021-03-031-189/+189
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7863: Prevent renaming SelfType and BuiltinType r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <[email protected]>
| * | | Prevent renaming SelfType and BuiltinTypeLukas Wirth2021-03-031-0/+2
| | | |
| * | | Reorder functions in rename.rsLukas Wirth2021-03-031-189/+187
| | | |
* | | | Remove incorrect broken testJonas Schievink2021-03-031-24/+0
|/ / / | | | | | | | | | | | | `Struct` cannot be named at all in that position, since `super` doesn't resolve to the block scope
* | | Special-case parenthesized and negated expressions in demorgan assistJesse Bakker2021-03-031-2/+43
| | |
* | | Update lexerkjeremy2021-03-021-1/+1
|/ /
* | Merge #7851bors[bot]2021-03-022-616/+424
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7851: Compress tests r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Compress testsAleksey Kladov2021-03-022-616/+424
| | |
* | | chore: remove redundant testsConrad Ludgate2021-03-021-30/+0
| | |
* | | chore: codegenConrad Ludgate2021-03-021-19/+0
| | |
* | | refactor: re-use add_turbo_fish functionConrad Ludgate2021-03-023-201/+137
| | |
* | | chore: fmt + docsConrad Ludgate2021-03-021-2/+2
| | |
* | | chore: rename varConrad Ludgate2021-03-021-3/+3
| | |
* | | feat: add type ascription assistConrad Ludgate2021-03-023-0/+219
| | |
* | | Merge #7850bors[bot]2021-03-021-12/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7850: Don't add space when joining line to opening quote r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Don't add space when joining line to opening quoteAleksey Kladov2021-03-021-12/+62
| | | |
* | | | Merge #7795bors[bot]2021-03-024-19/+139
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7795: Show docs on hover for keywords and primitives r=matklad a=Veykril ![lAWFadkziX](https://user-images.githubusercontent.com/3757771/109369534-eeb4f500-789c-11eb-8f2b-2f9c4e129de3.gif) It's a bit annoying that this requires the `SyntaxNode` and `Semantics` to be pulled through `hover_for_definition` just so we can get the `std` crate but I couldn't think of a better way. Co-authored-by: Lukas Wirth <[email protected]>
| * | | | Show docs on hover for keywords and primitivesLukas Wirth2021-03-024-19/+139
| | | | |
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge #7335 #7691bors[bot]2021-03-026-16/+1174
|\ \ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7335: added region folding r=matklad a=LucianoBestia Regions of code that you'd like to be folded can be wrapped with `// #region` and `// #endregion` line comments. This is called "Region Folding". It is originally available for many languages in VSCode. But Rust-analyzer has its own folding function and this is missing. With this Pull Request I am suggesting a simple solution. The regions are a special kind of comments, so I added a bit of code in the comment folding function. The regex to match are: `^\s*//\s*#?region\b` and `^\s*//\s*#?endregion\b`. The number of space characters is not important. There is an optional # character. The line can end with a name of the region. Example: ```rust // 1. some normal comment // region: test // 2. some normal comment calling_function(x,y); // endregion: test ``` I added a test for this new functionality in `folding_ranges.rs`. Please, take a look and comment. I found that these exact regexes are already present in the file `language-configuration.json`, but I don't find a way to read this configuration. So my regex is hardcoded in the code. 7691: Suggest name in extract variable r=matklad a=cpud36 Generate better default name in extract variable assist as was mentioned in issue #1587 # Currently supported (in order of declining precedence) 1. Expr is argument to a function; use corresponding parameter name 2. Expr is result of a function or method call; use this function/method's name 3. Use expr type name (if possible) 4. Fallback to `var_name` otherwise # Showcase ![generate_derive_variable_name_from_method](https://user-images.githubusercontent.com/4218373/108013304-72105400-701c-11eb-9f13-eec52e74d0cc.gif) ![generate_derive_variable_name_from_param](https://user-images.githubusercontent.com/4218373/108013305-72a8ea80-701c-11eb-957e-2214f7f005de.gif) # Questions * Should we more aggressively strip known types? E.g. we already strip `&T -> T`; should we strip `Option<T> -> T`, `Result<T, E> -> T`, and others? * Integers and floats use `var_name` by default. Should we introduce a name, like `i`, `f` etc? * Can we return a list and suggest a name when renaming(like IntelliJ does)? * Should we add counters to remove duplicate variables? E.g. `type`, `type1`, type2`, etc. Co-authored-by: Luciano Bestia <[email protected]> Co-authored-by: Luciano <[email protected]> Co-authored-by: Vladyslav Katasonov <[email protected]>
| | * | | | strip useless methods, and unary ops in suggest_nameVladyslav Katasonov2021-03-021-7/+114
| | | | | |
| | * | | | pull out suggest_name::* to utils; enchance heuristicsVladyslav Katasonov2021-03-024-89/+821
| | | | | |
| | * | | | suggest parameter name before function nameVladyslav Katasonov2021-03-021-5/+5
| | | | | |
| | * | | | try to suggest name when extracting variableVladyslav Katasonov2021-03-021-7/+287
| | | |/ / | | |/| |
| * | | | rustfmt 1.4.30-stableLuciano Bestia2021-02-182-6/+8
| | | | |
| * | | | corrected no newline at end of fileLuciano Bestia2021-02-131-1/+1
| | | | |
| * | | | removed logging stuffLuciano Bestia2021-02-132-9/+1
| | | | |
| * | | | Update crates/ide/src/folding_ranges.rsLuciano2021-02-131-2/+2
| | | | | | | | | | | | | | | Co-authored-by: Lukas Wirth <[email protected]>
| * | | | simple comparison instead of regexLuciano Bestia2021-02-052-25/+8
| | | | |
| * | | | added region foldingLuciano Bestia2021-01-183-9/+73
| | | | |
* | | | | Merge #7513bors[bot]2021-03-028-163/+579
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7513: NFA parser for mbe matcher r=matklad a=edwin0cheng Almost straight porting from rustc one, but a little bit slow :( ``` rust-analyzer analysis-stats -q . ``` From: ```log Database loaded: 636.11ms, 277minstr crates: 36, mods: 594, decls: 11527, fns: 9017 Item Collection: 10.99s, 60ginstr exprs: 249618, ??ty: 2699 (1%), ?ty: 2101 (0%), !ty: 932 Inference: 28.94s, 123ginstr Total: 39.93s, 184ginstr ``` To: ```log Database loaded: 630.90ms, 277minstr crates: 36, mods: 594, decls: 11528, fns: 9018 Item Collection: 13.70s, 77ginstr exprs: 249482, ??ty: 2699 (1%), ?ty: 2101 (0%), !ty: 932 Inference: 30.27s, 133ginstr Total: 43.97s, 211ginstr ``` Fixes #4777 Co-authored-by: Edwin Cheng <[email protected]>
| * | | | NFA parser for mbe matcherEdwin Cheng2021-02-288-163/+579
| | | | |