aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge #3252bors[bot]2020-02-202-6/+10
|\ | | | | | | | | | | | | | | | | | | 3252: Improve integration with token color configuration r=matklad a=eaglgenes101 First, the extension now checks theme token color customizations as well as global token color customizations when determining what colors to highlight syntax with. Theme token color customizations take precedence over both global token color customizations and the theme token colors. Second, a few additional token color customization keys used by other themes are added. The original paths still take precedence, but now turning on rust analyzer syntax highlighting should now not unexpectedly homogenize token colors when custom themes are used. Co-authored-by: eaglgenes101 <[email protected]>
| * Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzereaglgenes1012020-02-201-1/+14
| |\
| * | Improved compatibility with themeseaglgenes1012020-02-202-6/+10
| | |
* | | Merge #3251bors[bot]2020-02-201-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3251: Better errorse r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Better errorseAleksey Kladov2020-02-201-2/+2
|/ /
* | Merge #3248bors[bot]2020-02-201-1/+14
|\ \ | |/ |/| | | | | | | | | | | 3248: Fix off by one in onEnter r=matklad a=lnicola Co-authored-by: Laurențiu Nicola <[email protected]>
| * Fix off by one in onEnterLaurențiu Nicola2020-02-201-1/+14
|/
* Merge pull request #3242 from matklad/deny-cAleksey Kladov2020-02-191-0/+1
|\ | | | | Deny c
| * Check that we use no C deps on CIAleksey Kladov2020-02-191-0/+1
|/ | | | | | | | | C deps are not a problem for a typical build, but cause issues in more esoteric scenarios, like cross-compiling. Let's check that we don't have them. Setting `CC` to some dummy value should do the trick, as custom build scripts typically respect this variable.
* Merge #3215bors[bot]2020-02-192-6/+34
|\ | | | | | | | | | | | | | | | | | | 3215: Exclude methods from non-parameter types introduced by generic constraints r=flodiebold a=lnicola Fixes #3184. r? @flodiebold Co-authored-by: Laurențiu Nicola <[email protected]>
| * Exclude methods from non-parameter types introduced by generic constraintsLaurențiu Nicola2020-02-192-6/+34
| |
* | Merge #3241bors[bot]2020-02-192-7/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3241: Fill missing fields of enum variants r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Fill missing fields of enum variantsAleksey Kladov2020-02-192-7/+40
|/ /
* | Merge pull request #3239 from matklad/opt-backtraceAleksey Kladov2020-02-192-1/+2
|\ \ | | | | | | Make backtrace optional
| * | Make backtrace optionalAleksey Kladov2020-02-192-1/+2
| | |
* | | Merge #3238bors[bot]2020-02-192-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 3238: Bump lsp-types r=kjeremy a=kjeremy bors r+ Co-authored-by: kjeremy <[email protected]>
| * | Bump lsp-typeskjeremy2020-02-192-2/+3
|/ /
* | Merge #3236bors[bot]2020-02-198-119/+91
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3236: Merge NameDefinition and NameKind r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Merge NameDefinition and NameKindAleksey Kladov2020-02-198-119/+91
| | |
* | | Merge #3235bors[bot]2020-02-193-53/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3235: Derive visibility as well r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Derive visibility as wellAleksey Kladov2020-02-193-53/+55
| | |
* | | Merge #3234bors[bot]2020-02-194-60/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3234: Don't store deriveable Module info in NameDefinition r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Don't store deriveable Module info in NameDefinitionAleksey Kladov2020-02-194-60/+84
| | |
* | | Merge #3233bors[bot]2020-02-191-0/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3233: Extend selection handles commas in tuple pats r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Extend selection handles commas in tuple patsAleksey Kladov2020-02-191-0/+27
|/ /
* | Merge #3231bors[bot]2020-02-194-0/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3231: Add `remove_mut` assist r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Add `remove_mut` assistAleksey Kladov2020-02-194-0/+67
| | |
* | | Merge #3228bors[bot]2020-02-191-9/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3228: Use proper range for hover on macro arguments r=matklad a=edwin0cheng This PR use `original_range` to remap the range of found syntax node in `hover` and thus it should return the proper text range now. fixed #3000 fixed #3135 Co-authored-by: Edwin Cheng <[email protected]>
| * | Use proper range for hover on macro argumentsEdwin Cheng2020-02-191-9/+17
| |/
* | Merge #3229bors[bot]2020-02-195-9/+22
|\ \ | |/ |/| | | | | | | | | | | 3229: Fix a crash with non-ascii whitespace in doc-comments r=matklad a=sinkuu 2nd commit is a random drive-by cleanup. Co-authored-by: Shotaro Yamada <[email protected]>
| * CleanupShotaro Yamada2020-02-193-7/+3
| |
| * Fix a crash with non-ascii whitespace in doc-commentsShotaro Yamada2020-02-192-2/+19
|/
* Merge #3225bors[bot]2020-02-181-22/+18
|\ | | | | | | | | | | | | | | | | | | | | 3225: Cleanup imports r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Cleanup importsAleksey Kladov2020-02-181-22/+18
|/
* Merge #3223bors[bot]2020-02-181-6/+3
|\ | | | | | | | | | | | | | | 3223: Minor simplification r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Minor simplificationAleksey Kladov2020-02-181-6/+3
|/
* Merge #3221bors[bot]2020-02-181-12/+12
|\ | | | | | | | | | | | | | | 3221: Fix dev guide broken links r=matklad a=lnicola Co-authored-by: Laurențiu Nicola <[email protected]>
| * Fix dev guide broken linksLaurențiu Nicola2020-02-181-12/+12
| |
* | Merge #3220bors[bot]2020-02-1888-391/+381
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 3220: Fix clippy warnings, update Cargo.toml versions r=matklad a=SomeoneToIgnore In the `cargo xtask lint` ouptut, there were two interesting Clippy warnings that might be interesting to investigate further: * warning: this argument (4 byte) is passed by reference, but would be more efficient if passed by value (limit: 8 byte) * warning: large size difference between variants Co-authored-by: Kirill Bulatov <[email protected]>
| * Update versionsKirill Bulatov2020-02-1821-84/+109
| |
| * More manual clippy fixesKirill Bulatov2020-02-1832-159/+141
| |
| * Run cargo +nightly fix --clippy -Z unstable-optionsKirill Bulatov2020-02-1848-149/+132
|/
* Merge #3218bors[bot]2020-02-185-32/+14
|\ | | | | | | | | | | | | | | 3218: Cut some deps r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Remove unicase dependencyAleksey Kladov2020-02-183-24/+13
| |
| * Drop extra depsAleksey Kladov2020-02-182-8/+0
| |
| * Ignore cargo -Z timings infoAleksey Kladov2020-02-181-0/+1
| |
* | Merge #3217bors[bot]2020-02-181-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | 3217: Remove dat FIXME r=matklad a=Veetaha Co-authored-by: Veetaha <[email protected]>
| * | Remove dat FIXMEVeetaha2020-02-181-1/+0
|/ /
* | Merge #3026bors[bot]2020-02-1856-650/+452
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3026: ra_syntax: reshape SyntaxError for the sake of removing redundancy r=matklad a=Veetaha Followup of #2911, also puts some crosses to the todo list of #223. **AHTUNG!** A big part of the diff of this PR are test data files changes. Simplified `SyntaxError` that was `SyntaxError { kind: { /* big enum */ }, location: Location }` to `SyntaxError(String, TextRange)`. I am not sure whether the tuple struct here is best fit, I am inclined to add names to the fields, because I already provide getters `SyntaxError::message()`, `SyntaxError::range()`. I also removed `Location` altogether ... This is currently WIP, because the following is not done: - [ ] ~~Add tests to `test_data` dir for unescape errors *// I don't know where to put these errors in particular, because they are out of the scope of the lexer and parser. However, I have an idea in mind that we move all validators we have right now to parsing stage, but this is up to discussion...*~~ **[UPD]** I came to a conclusion that tree validation logic, which unescape errors are a part of, should be rethought of, we currently have no tests and no place to put tests for tree validations. So I'd like to extract potential redesign (maybe move of tree validation to ra_parser) and adding tests for this into a separate task. Co-authored-by: Veetaha <[email protected]> Co-authored-by: Veetaha <[email protected]>
| * ra_syntax: fix reparsing merging errors, also now reparse_token() reports errorsVeetaha2020-02-181-7/+50
| |