aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cargo updateJeremy Kolb2020-12-191-10/+10
|
* Merge #6946bors[bot]2020-12-1912-216/+263
|\ | | | | | | | | | | | | | | | | | | 6946: Better fuzzy heuristics r=matklad a=SomeoneToIgnore Continuation of the https://github.com/rust-analyzer/rust-analyzer/pull/6922, mainly created for a test. Turns out our current completions tests were sorting the completions by label, I had to remove that to test the order properly and update this order in a bunch of tests (ergo the changes) Co-authored-by: Kirill Bulatov <[email protected]>
| * Fewer allocationsKirill Bulatov2020-12-191-5/+7
| |
| * Tidy upKirill Bulatov2020-12-192-32/+26
| |
| * Keep the original completion order in testsKirill Bulatov2020-12-1912-194/+193
| |
| * Add a slightly better fuzzy search heuristicsKirill Bulatov2020-12-191-10/+62
| |
* | Merge #6951bors[bot]2020-12-196-36/+39
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6951: Make sure that HighlightModifier::ALL is synchronized with enum r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Make sure that HighlightModifier::ALL is synchronized with enumAleksey Kladov2020-12-196-36/+39
|/ /
* | Merge #6948bors[bot]2020-12-191-23/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | 6948: Add API for mapping `Attr` back to its syntax node r=jonas-schievink a=jonas-schievink This will be useful for emitting diagnostics pertaining to a specific attribute Co-authored-by: Jonas Schievink <[email protected]>
| * | Add API for mapping `Attr` back to its syntax nodeJonas Schievink2020-12-191-23/+55
| |/
* | Merge #6949bors[bot]2020-12-194-15/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6949: Clarify the meaning of no-op highlight tag r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Clarify the meaning of no-op highlight tagAleksey Kladov2020-12-194-15/+14
| | |
* | | Merge #6947bors[bot]2020-12-198-47/+69
|\| | | |/ |/| | | | | | | | | | | | | 6947: Use more Rustic highlighting specifiers r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Use more Rustic highlighting specifiersAleksey Kladov2020-12-198-47/+69
|/ | | | | *Method* works for OO languages, but in rust we can also have associated constants & types, so let's move this to a modifier.
* Merge #6944bors[bot]2020-12-191-14/+2
|\ | | | | | | | | | | | | | | 6944: Make attribute API more private r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * Make `RawAttrs` crate-privateJonas Schievink2020-12-191-2/+2
| | | | | | | | There should be no need to use this from outside
| * Remove `Attrs::merge`Jonas Schievink2020-12-191-12/+0
|/ | | | Only the `RawAttrs` version of this is in use
* Merge #6943bors[bot]2020-12-191-1/+0
|\ | | | | | | | | | | | | | | 6943: Remove resolved FIXME r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * Remove resolved FIXMEJonas Schievink2020-12-191-1/+0
|/
* Merge #6942bors[bot]2020-12-196-33/+66
|\ | | | | | | | | | | | | | | 6942: Minor `#[derive]` resolution cleanup r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * fixture -> ra_fixtureJonas Schievink2020-12-192-4/+4
| |
| * Test paths to derive macrosJonas Schievink2020-12-191-2/+2
| |
| * More accurate `#[derive]` parsingJonas Schievink2020-12-194-27/+60
|/ | | | This now allows full paths to the derive macro
* Merge #6937bors[bot]2020-12-186-124/+128
|\ | | | | | | | | | | | | | | | | 6937: Deduplicate highlight tags and symbol kinds r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Deduplicate highlight tags and symbol kindsAleksey Kladov2020-12-186-124/+128
| | | | | | | | | | | | | | Curiously, LSP uses different enums for those, and unsurprising and annoyingly, there are things which exist in one but not in the other. Let's not repeat the mistake and unify the two things
* | Merge #6935bors[bot]2020-12-183-15/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 6935: Don't look at attributes when lowering to ItemTree r=jonas-schievink a=jonas-schievink Resolves 2 `cfg_attr` FIXMEs bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Don't look at attributes when lowering to ItemTreeJonas Schievink2020-12-183-15/+28
| |/ | | | | | | Resolves 2 `cfg_attr` FIXMEs
* | Merge #6934bors[bot]2020-12-186-3/+97
|\ \ | |/ |/| | | | | | | | | | | 6934: Implement `cfg_attr` handling r=jonas-schievink a=jonas-schievink Part of https://github.com/rust-analyzer/rust-analyzer/issues/5548 Co-authored-by: Jonas Schievink <[email protected]>
| * Hit a markJonas Schievink2020-12-182-0/+5
| |
| * Add testJonas Schievink2020-12-181-0/+16
| |
| * Fix parsing of active cfg_attrJonas Schievink2020-12-181-2/+2
| |
| * Implement `RawAttr::filter`Jonas Schievink2020-12-185-3/+76
| |
* | Merge #6933bors[bot]2020-12-187-453/+140
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6933: Reduce test verbosity r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Reduce test verbosityAleksey Kladov2020-12-183-597/+169
| | |
| * | NavTarget doesn't assume that it points to a symbolAleksey Kladov2020-12-187-81/+196
|/ /
* | Merge #6932bors[bot]2020-12-181-0/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6932: Added a warning if conflicting rust-lang.rust is enabled. r=lnicola a=extremegf Added a warning if conflicting rust-lang.rust plugin is enabled. Resolves #6463 ![Screenshot from 2020-12-18 18-33-02](https://user-images.githubusercontent.com/1788593/102644202-b2f50500-4160-11eb-8fb0-76aeebd80aea.png) Co-authored-by: Przemyslaw Horban <[email protected]>
| * | Fixed formattingPrzemyslaw Horban2020-12-181-2/+2
| | |
| * | Added a warning if conflicting rust-lang.rust is enabled.Przemyslaw Horban2020-12-181-0/+11
|/ /
* | Merge #6931bors[bot]2020-12-182-1/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6931: Minor, cleanup API r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Minor, cleanup APIAleksey Kladov2020-12-182-1/+4
|/ /
* | Merge #6930bors[bot]2020-12-1813-250/+348
|\ \ | |/ |/| | | | | | | | | | | | | 6930: Don't expose SyntaxKind from IDE API r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Don't expose SyntaxKind from IDE APIAleksey Kladov2020-12-1813-239/+337
| | | | | | | | | | | | SyntaxKind is somewhat of an internal type, but IDE is using it to basically specify an icon. Let's have a dedicated entity for this instead.
| * Cleaup importsAleksey Kladov2020-12-182-13/+13
|/ | | | ide should re-export everything it needs.
* Merge #6927bors[bot]2020-12-182-1/+28
|\ | | | | | | | | | | | | | | 6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker Fixes #6925 Co-authored-by: Jesse Bakker <[email protected]>
| * Do not merge imports with different attributesJesse Bakker2020-12-182-1/+28
|/
* Merge #6901bors[bot]2020-12-184-1/+22
|\ | | | | | | | | | | | | | | | | | | 6901: Temp fixes panic caused by no ast for proc-macro r=maklad a=edwin0cheng There are some panic when hover/goto definition for proc-macro. It is because in current design, we don't have `ast-node` for proc-macro and then it trigger [this](https://github.com/rust-analyzer/rust-analyzer/blob/479d1f7eec22c3564867223e2093f14774092528/crates/hir/src/has_source.rs#L116) line to panic. This PR is a temp fix for all of these similar to https://github.com/rust-analyzer/rust-analyzer/blob/bd4c352831662762ee7a66da77ec9adf623b0a0a/crates/completion/src/render/macro_.rs#L42 Co-authored-by: Edwin Cheng <[email protected]>
| * Temp fixes panic caused by no ast for proc-macroEdwin Cheng2020-12-184-1/+22
| |
* | Merge #6924bors[bot]2020-12-188-114/+187
|\ \ | | | | | | | | | | | | | | | | | | | | | 6924: Refactor attributes API to allow handling cfg_attr later r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Refactor attributes API to allow handling cfg_attrJonas Schievink2020-12-188-114/+187
|/ /
* | Merge #6922bors[bot]2020-12-171-5/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | 6922: Show first fuzzy completions fully containing the input r=matklad a=SomeoneToIgnore Co-authored-by: Kirill Bulatov <[email protected]>