aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expand legacy-scoped macro during collectionJonas Schievink2021-03-212-6/+28
|
* Merge #8122bors[bot]2021-03-218-14/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8122: Make bare underscore token an Ident rather than Punct in proc-macro r=edwin0cheng a=kevinmehall In rustc and proc-macro2, a bare `_` token is parsed for procedural macro purposes as `Ident` rather than `Punct` (see https://github.com/rust-lang/rust/pull/48842). This changes rust-analyzer to match rustc's behavior and implementation by handling `_` as an Ident in token trees, but explicitly preventing `$x:ident` from matching it in MBE. proc macro crate: ```rust #[proc_macro] pub fn input(input: proc_macro::TokenStream) -> proc_macro::TokenStream { dbg!(input) } ``` test crate: ```rust test_proc_macro::input!(_); ``` output (rustc): ```rust [test-proc-macro/src/lib.rs:10] input = TokenStream [ Ident { ident: "_", span: #0 bytes(173..174), }, ] ``` output (rust-analyzer before this change): ```rust [test-proc-macro/src/lib.rs:10] input = TokenStream [ Punct { ch: '_', spacing: Joint, span: 4294967295, }, ] ``` output (rust-analyzer after this change): ```rust [test-proc-macro/src/lib.rs:10] input = TokenStream [ Ident { ident: "_", span: 4294967295, }, ] ``` Co-authored-by: Kevin Mehall <[email protected]>
| * Fix and test edge cases of `_` as identKevin Mehall2021-03-203-3/+13
| |
| * Make bare underscore token an Ident rather than Punct in proc-macroKevin Mehall2021-03-206-12/+24
| |
* | Merge #8124bors[bot]2021-03-205-14/+233
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8124: Add basic lifetime completion r=Veykril a=Veykril This adds basic lifetime completion, basic in the sense that the completions for lifetimes are only shown when the user enters `'` followed by a char. Showing them when nothing is entered is kind of a pain, as we would want them to only show up where they are useful which in turn requires a lot of tree traversal and cursor position checking to verify whether the position is valid for a lifetime. This in itself doesn't seem too bad as usually when you know you want to write a lifetime putting `'` to ask for lifetime completions seems fine. ~~I'll take a look at whether its possible to lift the restriction of having to put a char after `'`.~~ This actually already works so I guess this is the clients responsibility, in which case VSCode doesn't like it. ![TYH9gIlyVo](https://user-images.githubusercontent.com/3757771/111886437-c9b02f80-89cd-11eb-9bee-340f1536b0de.gif) Co-authored-by: Lukas Wirth <[email protected]>
| * | Add basic lifetime completionLukas Wirth2021-03-205-14/+233
| |/
* | Merge #8125bors[bot]2021-03-205-24/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | 8125: Don't use an untyped String for ActiveParam tracking r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <[email protected]>
| * | Don't use an untyped String for ActiveParam trackingLukas Wirth2021-03-205-24/+44
| |/
* | Merge #8121bors[bot]2021-03-201-0/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | 8121: Temporarily run git describe on CI to debug #8043 r=lnicola a=lnicola bors r+ changelog skip Co-authored-by: Laurențiu Nicola <[email protected]>
| * Temporarily run git describe to debug #8043Laurențiu Nicola2021-03-201-0/+3
|/
* Merge #8119bors[bot]2021-03-204-12/+10
|\ | | | | | | | | | | | | | | 8119: Don't return a SourceChange on WillRenameFiles when nothing gets refactored r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <[email protected]>
| * Don't return a SourceChange on WillRenameFiles when nothing gets refactoredLukas Wirth2021-03-202-8/+7
| |
| * Fix add_life_to_type label typoLukas Wirth2021-03-202-4/+3
| |
* | Merge #8117bors[bot]2021-03-2014-91/+130
|\ \ | | | | | | | | | | | | | | | | | | | | | 8117: Turn Obligation into something similar to chalk_ir::DomainGoal r=flodiebold a=flodiebold This includes starting to make use of Chalk's `Cast` trait. Co-authored-by: Florian Diebold <[email protected]>
| * | Turn Obligation into something similar to chalk_ir::DomainGoalFlorian Diebold2021-03-2014-91/+130
| | | | | | | | | | | | This includes starting to make use of Chalk's `Cast` trait.
* | | Merge #8116bors[bot]2021-03-207-42/+8
|\| | | | | | | | | | | | | | | | | | | | | | | 8116: Remove WhereClause::Error r=flodiebold a=flodiebold Chalk doesn't have it, and judging from the removed code, it wasn't useful anyway. Co-authored-by: Florian Diebold <[email protected]>
| * | Remove WhereClause::ErrorFlorian Diebold2021-03-207-42/+8
| | | | | | | | | | | | | | | Chalk doesn't have it, and judging from the removed code, it wasn't useful anyway.
* | | Merge #8115bors[bot]2021-03-2010-105/+89
|\| | | | | | | | | | | | | | | | | | | | | | | 8115: Rename GenericPredicate -> WhereClause r=flodiebold a=flodiebold Co-authored-by: Florian Diebold <[email protected]>
| * | Rename GenericPredicate -> WhereClauseFlorian Diebold2021-03-2010-105/+89
|/ /
* | Merge #8112bors[bot]2021-03-197-187/+248
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 8112: Revamp `hir_def` attribute API r=Veykril a=jonas-schievink This adds `AttrsWithOwner`, which can construct an accurate `AttrSourceMap` without requiring additional information from the caller. r? @Veykril Co-authored-by: Jonas Schievink <[email protected]>
| * | Add `AttrsWithOwner` and clean up `source_map`Jonas Schievink2021-03-195-155/+216
| | |
| * | Move `AttrsOwnerNode` to syntax and make it publicJonas Schievink2021-03-193-33/+33
|/ /
* | Merge #8111bors[bot]2021-03-194-18/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | 8111: Return `Either` from `MacroDefId::ast_id` r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Return `Either` from `MacroDefId::ast_id`Jonas Schievink2021-03-194-18/+15
|/ /
* | Merge #8110bors[bot]2021-03-191-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 8110: simplify r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | simplifyAleksey Kladov2021-03-191-3/+3
| | | | | | | | | | | | changelog skip
* | | Merge #8109bors[bot]2021-03-192-40/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 8109: Make ast editing more ergonomic r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Make ast editing more ergonomicAleksey Kladov2021-03-192-40/+66
| |/ | | | | | | changelog internal
* | Merge #8108bors[bot]2021-03-192-21/+48
|\ \ | |/ |/| | | | | | | | | | | 8108: Fix handling of `#![cfg]` in outline module file r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * Fix handling of `#![cfg]` in outline module fileJonas Schievink2021-03-192-21/+48
|/
* Merge #8106bors[bot]2021-03-191-2/+5
|\ | | | | | | | | | | | | | | | | | | 8106: Add builtin macro-like attributes r=jonas-schievink a=jonas-schievink We also have to know about these to resolve them bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * Add builtin macro-like attributesJonas Schievink2021-03-191-2/+5
|/
* Merge #8104bors[bot]2021-03-195-13/+13
|\ | | | | | | | | | | | | | | | | | | 8104: Rename derive-specific APIs r=jonas-schievink a=jonas-schievink Indicate that they're derive-specific bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * Rename derive-specific APIsJonas Schievink2021-03-195-13/+13
|/
* Merge #8102bors[bot]2021-03-191-27/+17
|\ | | | | | | | | | | | | | | 8102: Cleanup qualify_path r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <[email protected]>
| * Cleanup qualify_pathLukas Wirth2021-03-191-27/+17
|/
* Merge #8097bors[bot]2021-03-197-41/+32
|\ | | | | | | | | | | | | | | 8097: Parse extended_key_value_attributes r=jonas-schievink a=Veykril Companion PR https://github.com/rust-analyzer/ungrammar/pull/31 Co-authored-by: Lukas Wirth <[email protected]>
| * Parse extended_key_value_attributesLukas Wirth2021-03-197-41/+32
| |
* | Merge #8101bors[bot]2021-03-1910-131/+221
|\ \ | | | | | | | | | | | | | | | | | | | | | 8101: Replace Projection variant in GenericPredicate with AliasEq r=flodiebold a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
| * | Replace Projection variant in GenericPredicate with AliasEqLukas Wirth2021-03-1910-131/+221
| | |
* | | Merge #8099bors[bot]2021-03-181-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 8099: Document fields of `ModuleId` r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Document fields of `ModuleId`Jonas Schievink2021-03-181-1/+5
|/ /
* | Merge #8095bors[bot]2021-03-182-3/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | 8095: Fix associated items not being appended to paths in import_assets r=SomeoneToIgnore a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
| * | Fix associated items not being appended to paths in import_assetsLukas Wirth2021-03-182-3/+40
| |/
* | Merge #8086bors[bot]2021-03-1814-31/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | 8086: Use a highlight modifier for intra doc links r=Veykril a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
| * | Use a highlight modifier for intra doc linksLukas Wirth2021-03-1814-31/+55
|/ /
* | Merge #8096bors[bot]2021-03-1815-73/+99
|\ \ | | | | | | | | | | | | | | | | | | | | | 8096: Chalkify TraitRef r=flodiebold a=flodiebold Co-authored-by: Florian Diebold <[email protected]>
| * | Chalkify TraitRefFlorian Diebold2021-03-1815-73/+99
|/ /
* | Merge #8083bors[bot]2021-03-183-26/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | 8083: Track source file IDs in source mapping of Attrs r=jonas-schievink a=Veykril Fixes the panics/incorrect injection highlighting of outline module declarations until we figure out a nicer source mapping strategy for attributes. Co-authored-by: Lukas Wirth <[email protected]>
| * | Track source file IDs in source mapping of AttrsLukas Wirth2021-03-183-26/+76
| | |