aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge #2188bors[bot]2019-11-061-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2188: Ignore line-endings when checking generated files for freshness r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Ignore line-endings when checking generated files for freshnessAleksey Kladov2019-11-061-2/+6
| |/ / / | | | | | | | | | | | | closes #2184
* | | | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-051-12/+21
|\| | | | | | | | | | | | | | | feature/themes
| * | | Merge #2187bors[bot]2019-11-051-12/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2187: Update smallvec to avoid UB and cc while we're at it r=kjeremy a=kjeremy See: https://github.com/servo/rust-smallvec/releases/tag/v0.6.13 Co-authored-by: kjeremy <[email protected]>
| | * | | Update smallvec to avoid UB and cc while we're at itkjeremy2019-11-051-12/+21
| |/ / /
* | | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-052-11/+11
|\| | |
| * | | Merge #2185bors[bot]2019-11-052-11/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2185: Bump psm, console, indicatif r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| | * | | Bump psm, console, indicatifkjeremy2019-11-052-11/+11
| |/ / /
* | | | See if this satisfies the CI.Seivan Heidari2019-11-051-5/+5
| | | |
* | | | Fix typo.Seivan Heidari2019-11-041-1/+1
| | | |
* | | | Clearer docs usage under `rust-analyzer.scopeMappings`.Seivan Heidari2019-11-041-1/+1
| | | |
* | | | Remove new line.Seivan Heidari2019-11-041-1/+0
| | | |
* | | | Logging fallback tag in case scopes are missing.Seivan Heidari2019-11-041-3/+5
| | | |
* | | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-0420-342/+323
|\| | |
| * | | Merge #2177bors[bot]2019-11-041-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2177: Reduce visibility r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Reduce visibilityAleksey Kladov2019-11-041-2/+2
| |/ / /
| * | | Merge #2176bors[bot]2019-11-049-26/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2176: Move Namespace enum closer to usage r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Move Namespace enum closer to usageAleksey Kladov2019-11-049-26/+29
| | | | |
| * | | | Merge #2175bors[bot]2019-11-048-306/+212
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2175: Appease the linter by dummy doc comments r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Appease the linter by dummy doc commentsAleksey Kladov2019-11-042-1/+3
| | | | |
| | * | | SimplifyAleksey Kladov2019-11-041-35/+24
| | | | |
| | * | | Restore assists testsAleksey Kladov2019-11-043-4/+50
| | | | |
| | * | | Rename MockDatabase -> TestDBAleksey Kladov2019-11-046-60/+57
| | | | | | | | | | | | | | | | | | | | Actually working rename is sooo useful!
| | * | | remove dead codeAleksey Kladov2019-11-041-26/+7
| | | | |
| | * | | Remove more duplication in test fixturesAleksey Kladov2019-11-045-62/+18
| | | | |
| | * | | Remove some duplicated test functionsAleksey Kladov2019-11-041-81/+16
| | | | |
| * | | | Merge #2174bors[bot]2019-11-042-6/+10
| |\| | | | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 2174: Reduce visibility r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Reduce visibilityAleksey Kladov2019-11-042-6/+10
| |/ /
| * | 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
| | |
* | | * Adding scope mapping configuration manifest in `package.json`Seivan Heidari2019-11-046-68/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Loading configurable scope mappings from settings. * Updating Readme with `rust-analyzer.scopeMappings`. `rust-analyzer.scopeMappings` -- a scheme backed JSON object to tweak Rust Analyzer scopes to TextMate scopes. ```jsonc { //Will autocomplete keys to available RA scopes. "keyword.unsafe": ["keyword", "keyword.control"], //Values are string | TextMateScope | [string | TextMateScope] "comments": "comment.block" } ```
* | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-0461-1312/+1810
|\| |
| * | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:19:51 +0000