aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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]>
| * | Show first fuzzy completions fully containing the inputKirill Bulatov2020-12-171-5/+14
|/ /
* | Merge #6912bors[bot]2020-12-171-2/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6912: Default to host platform for cargo metadata r=jonhoo a=jonhoo This modifies the logic for calling cargo metadata so that it will use the host platform if no explicit target platform is given. This is needed since cargo metadata defaults to outputting information for _all_ targets. Fixes #6908. Co-authored-by: Jon Gjengset <[email protected]> Co-authored-by: Jon Gjengset <[email protected]>
| * | Fun times with rustfmtJon Gjengset2020-12-171-2/+1
| | |
| * | Update crates/project_model/src/cargo_workspace.rsJon Gjengset2020-12-171-1/+1
| | | | | | | | | Co-authored-by: Aleksey Kladov <[email protected]>
| * | Default to host platform for cargo metadataJon Gjengset2020-12-171-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the logic for calling cargo metadata so that it will use the host platform if no explicit target platform is given. This is needed since cargo metadata defaults to outputting information for _all_ targets. Fixes #6908.
* | | Merge #6920bors[bot]2020-12-171-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6920: Minor API cleanup r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Minor API cleanupAleksey Kladov2020-12-171-4/+2
| | | |
* | | | Merge #6919bors[bot]2020-12-172-121/+89
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 6919: Rewrite doctest runnables r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Rewrite doctest runnablesAleksey Kladov2020-12-172-107/+83
| | | | | | | | | | | | | | | | Handle more cases in a generic way without copy-pasting code.
| * | | Minor code styleAleksey Kladov2020-12-171-27/+19
|/ / /
* | | Merge #6779bors[bot]2020-12-176-37/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6779: Latest LSP 3.16 r=kjeremy a=kjeremy Companion to gluon-lang/lsp-types#192 Co-authored-by: kjeremy <[email protected]>
| * | | LSP 3.16 - Releasedkjeremy2020-12-176-37/+54
|/ / /
* | | Merge #6916bors[bot]2020-12-174-40/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6916: Make `Attrs::from_attrs_owner` private r=matklad a=jonas-schievink It is only meant for use inside `hir` crates. Removes `docs_from_symbol`, which didn't seem to have any visible effect in VS Code. Co-authored-by: Jonas Schievink <[email protected]>
| * | | Make `Attrs::from_attrs_owner` privateJonas Schievink2020-12-174-40/+13
|/ / /
* | | Merge #6915bors[bot]2020-12-171-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6915: Add `AttrDefId::krate` r=jonas-schievink a=jonas-schievink Access to the containing crate will be needed to handle `cfg_attr`. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | | Add `AttrDefId::krate`Jonas Schievink2020-12-171-0/+30
|/ / / | | | | | | | | | Access to the containing crate will be needed to handle `cfg_attr`
* | | Merge #6914bors[bot]2020-12-1712-31/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6914: Rename ImplDef -> Impl r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Rename ImplDef -> ImplAleksey Kladov2020-12-1712-31/+31
|/ / / | | | | | | | | | | | | | | | We used to have `Def` suffix for all symbols, but we moved off from that. `FunctionDef` isn't better than `Function`. Looks like we've forgot to change `Impl` though!
* | | Merge #6907bors[bot]2020-12-1712-41/+373
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6907: Lifetime reference search r=matklad a=Veykril PR #6787 but rewritten to make use of the HIR now. This only applies to Lifetimes, not labels. Also Higher-Ranked Trait Bounds aren't supported yet, but I feel like this PR is big enough as is which is why I left them out after noticing I forgot about them. Supporting renaming required slight changes in the renaming module as lifetime names aren't allowed for anything but lifetimes(and labels) and vice versa for normal names. Co-authored-by: Lukas Wirth <[email protected]>
| * | | Lifetime reference searchLukas Wirth2020-12-1612-41/+373
| | | |
* | | | Merge #6911bors[bot]2020-12-173-60/+68
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6911: decl_check: don't pass `db` around so often r=matklad a=jonas-schievink Instead, store it in the `DeclValidator`. Also pass the `CrateId` that defines the checked item along. This is not yet needed, but will be once I've refactored `Attrs` to handle `cfg_attr` internally. We could also try to extract the crate from the "owner" `ModuleDefId` instead of passing it in, but then it might not be present for builtin types. Open to suggestions. Co-authored-by: Jonas Schievink <[email protected]>
| * | | decl_check: don't pass `db` around so oftenJonas Schievink2020-12-173-60/+68
|/ / /
* | | Merge #6910bors[bot]2020-12-164-57/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6910: Remove `module_lang_items` r=jonas-schievink a=jonas-schievink It isn't used anywhere except in `crate_lang_items`. Remove it to slightly reduce memory usage and simplify the code. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | | Remove `module_lang_items`Jonas Schievink2020-12-164-57/+32
|/ / / | | | | | | | | | | | | It isn't used anywhere except in `crate_lang_items`. Remove it to slightly reduce memory usage and simplify the code.
* | | Merge #6909bors[bot]2020-12-163-38/+28
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6909: Avoid querying attributes in item tree lowering r=jonas-schievink a=jonas-schievink ItemTree is per-file, so there is no unique crate associated with it. This means that it cannot know the active CfgOptions and thus couldn't handle `cfg_attr`. Prepare it for `cfg_attr`s by avoiding accessing attributes. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Avoid querying attributes in item tree loweringJonas Schievink2020-12-163-38/+28
|/ / | | | | | | | | | | | | | | ItemTree is per-file, so there is no unique crate associated with it. This means that it cannot know the active CfgOptions and thus couldn't handle `cfg_attr`. Prepare it for `cfg_attr`s by avoiding accessing attributes.
* | Merge #6896bors[bot]2020-12-1663-274/+420
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6896: Node-ify lifetimes r=jonas-schievink a=Veykril Let's see if this passes the tests 🤞 Depends on https://github.com/rust-analyzer/ungrammar/pull/15 Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Lukas Wirth <[email protected]>