aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge #2173bors[bot]2019-11-042-2/+70
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2173: MBE: Add TokenId shift in macro_rules r=matklad a=edwin0cheng As discussed in #2169 , for fixing duplication TokenId during expansion : > What we can do here is to re-number the tokens during expansion. Specifically: > * when we create macro_rules, we note the highest id of the token we have as shift> > * when we expand macro rules, if we need to output a token from definition, we just re-use its id > * if we need to output a token from the argument, we increase its id by shift (so it's guaranteed to not to collide with anything from the definition) > * finally, when we have a HirFileId of the expansion, we can look up the original value of shift and classify node to the arg/def by comparing it's id with shift. > This PR implement first 3 points of above solution. Co-authored-by: Edwin Cheng <[email protected]>
| * Change to add 1 if non zero shiftEdwin Cheng2019-11-041-1/+1
| |
| * Refactor and renameEdwin Cheng2019-11-041-21/+20
| |
| * Change Option<u32> to u32 for shift valueEdwin Cheng2019-11-041-8/+5
| |
| * Change to better namingEdwin Cheng2019-11-041-3/+3
| |
| * Add TokenId Shif in macro_rulesEdwin Cheng2019-11-042-2/+74
| |
* | Merge #2172bors[bot]2019-11-043-138/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | 2172: Use new text DSL instead of crate_graph! macro r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | Cleanup unused marksAleksey Kladov2019-11-041-10/+0
| | |
| * | Use new text DSL instead of crate_graph! macroAleksey Kladov2019-11-043-128/+25
| | |
* | | Merge #2149bors[bot]2019-11-042-29/+207
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2149: Handle IfLet in convert_to_guarded_return. r=matklad a=krk Fixes https://github.com/rust-analyzer/rust-analyzer/issues/2124 I could not move the cursor position out of `let`: `le<|>t` vs `let<|>`. Also, please suggest extra test cases. Co-authored-by: krk <[email protected]>
| * | Extract common parts of match arms in convert_to_guarded_return assist.krk2019-11-011-50/+37
| | |
| * | Support paths other than "Some".krk2019-11-012-10/+59
| | |
| * | Remove variable pat.krk2019-11-011-2/+1
| | |
| * | Handle IfLet in convert_to_guarded_return.krk2019-10-312-28/+171
| | |
* | | Merge #2171bors[bot]2019-11-0316-27/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2171: Reexport relative_path from ra_db r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Reexport relative_path from ra_dbAleksey Kladov2019-11-0316-27/+15
|/ / /
* | | Merge #2166bors[bot]2019-11-031-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2166: Fix snapshots and tests line-ending in Windows r=matklad a=edwin0cheng When running `cargo test` in Windows, there are some test and snapshots generated which are `LF` line-endings. This PR try to force `git` to use `LF` for these files. Co-authored-by: Edwin Cheng <[email protected]>
| * | | Fix snapshots line-ending in windowsEdwin Cheng2019-11-031-1/+2
| | | |
* | | | Merge #2163bors[bot]2019-11-0337-983/+1295
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 2163: Move CrateDefMap to hir_def r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Add small module-level docsAleksey Kladov2019-11-034-6/+18
| | | |
| * | | Remove last traces of nameres from hirAleksey Kladov2019-11-038-67/+59
| | | |
| * | | Restore crate_def_map marksAleksey Kladov2019-11-039-26/+41
| | | |
| * | | move crate_def_map tests to hir_defAleksey Kladov2019-11-0313-195/+309
| | | |
| * | | Introduce ra_db::fixture fixture moduleAleksey Kladov2019-11-037-11/+97
| | | | | | | | | | | | | | | | The goal here is to share more testing infrastructure between crates.
| * | | Move CrateDefMap to hir_defAleksey Kladov2019-11-0323-733/+826
|/ / /
* | | Merge #2160bors[bot]2019-11-034-1/+113
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 2160: Set `deprecated` field on `CompletionItem`s r=matklad a=martskins This PR aims to address #2042 by setting the deprecated field for completion items. The setting the tags field for LSP 3.15 part still needs fixing, but that one is blocked due to lsp-types not being up to date with 3.15 yet. Co-authored-by: Martin Asquino <[email protected]>
| * | Use `bool` instead of `Option<bool>` and print it's value only when `true`Martin Asquino2019-11-029-79/+6
| | |
| * | Set `deprecated` field on `CompletionItem`sMartin Asquino2019-11-029-1/+186
| | |
* | | Merge #2164bors[bot]2019-11-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2164: Silence some warnings r=matklad a=lnicola ``` warning: unnecessary parentheses around type --> crates/ra_tt/src/buffer.rs:114:32 | 114 | pub fn end(self) -> Option<(&'a Subtree)> { | ^^^^^^^^^^^^^ help: remove these parentheses | = note: `#[warn(unused_parens)]` on by default warning: unnecessary parentheses around type --> crates/ra_tt/src/buffer.rs:130:30 | 130 | fn entry(self) -> Option<(&'a Entry<'a>)> { | ^^^^^^^^^^^^^^^ help: remove these parentheses ``` Co-authored-by: Laurențiu Nicola <[email protected]>
| * | | Silence some warningsLaurențiu Nicola2019-11-021-2/+2
|/ / /
* | | Merge #2162bors[bot]2019-11-0211-109/+130
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2162: Move diagnostics to hir_expand r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Move diagnostics to hir_expandAleksey Kladov2019-11-028-89/+107
| | | |
| * | | Move Source to hir_expandAleksey Kladov2019-11-024-20/+23
|/ / /
* | | Merge #2159bors[bot]2019-11-021-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2159: Remove forcing \n via rustfmt r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Remove forcing \n via rustfmtAleksey Kladov2019-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original idea here was to make sure, on CI, that line endings are \n. Travis however uses autocrlf, so the check doesn't actually work, and forcing \n otherwise makes lives of windows folks difficult closes #2157
* | | | Merge #2156bors[bot]2019-11-022-30/+30
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 2156: Upgrade Chalk r=flodiebold a=flodiebold Co-authored-by: Florian Diebold <[email protected]>
| * | | Upgrade ChalkFlorian Diebold2019-11-022-30/+30
|/ / /
* | | Merge #2152bors[bot]2019-11-011-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2152: Use run-time project path in xtask r=matklad a=lnicola Fixes #2131. Co-authored-by: Laurențiu Nicola <[email protected]>
| * | | Use run-time project path in xtaskLaurențiu Nicola2019-11-011-1/+8
|/ / /
* | | Merge #2151bors[bot]2019-11-019-100/+560
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 2151: Resolve (and complete) trait calls like `Vec::default()` r=flodiebold a=flodiebold Similar to rustc, we do this using the same code as the method call resolution, just without doing autoderef (and considering more potential candidates). (Btw, we currently don't complete methods with `self` in path notation, even though they'd be legal to use, so maybe we should -- on the other hand, that will usually not be the most interesting completions...) Co-authored-by: Florian Diebold <[email protected]>
| * | Change SourceAnalyzer method resoltion APIFlorian Diebold2019-11-014-36/+44
| | |
| * | Various review fixesFlorian Diebold2019-11-013-17/+13
| | |
| * | Add some doc commentsFlorian Diebold2019-11-011-0/+6
| | |
| * | Complete items on traits as wellFlorian Diebold2019-11-011-2/+46
| | |
| * | Complete trait assoc itemsFlorian Diebold2019-11-015-17/+56
| | |
| * | Add failing tests for trait assoc method completionFlorian Diebold2019-11-011-0/+60
| | |
| * | Refactor a bitFlorian Diebold2019-11-011-36/+25
| | |
| * | Don't do autoderef for path resolutionFlorian Diebold2019-11-011-18/+39
| | |
| * | Refactor to unify with method resolutionFlorian Diebold2019-11-017-141/+117
| | |
| * | Record assoc item resolutionFlorian Diebold2019-11-012-1/+58
| | |