aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #1828bors[bot]2019-09-122-1/+40
|\ | | | | | | | | | | | | | | 1828: add macros with local_inner_macros argument r=matklad a=JasperDeSutter fixes #1816 Co-authored-by: JasperDeSutter <[email protected]>
| * add macros with local_inner_macros argumentJasperDeSutter2019-09-122-1/+40
|/
* Merge #1818bors[bot]2019-09-127-4/+107
|\ | | | | | | | | | | | | | | 1818: Infer box expression r=matklad a=uHOOCCOOHu Infer `box e` to be `std::boxed::Box<T>` where `e: T` Co-authored-by: uHOOCCOOHu <[email protected]>
| * Infer box expressionuHOOCCOOHu2019-09-117-4/+107
| |
* | Merge #1821bors[bot]2019-09-125-72/+109
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1821: Macro completion tweaks r=matklad a=SomeoneToIgnore Thanks @uHOOCCOOHu for making the macro completion happen :) I've added a few tweaks to the current completion to make it a bit more convenient: * Automatically add braces and put the editor cursor inside of them: <img width="159" alt="image" src="https://user-images.githubusercontent.com/2690773/64737220-022b9f00-d4f5-11e9-8088-76d4678921ab.png"> Currently I have to add the braces manually which is a bit cumbersome. One further improvement can be to detect if macro accepts no parameters and place the cursor differently for this case. * Add an exclamation mark to the macro completion label This helps to distinguish macros from other completion items and also allows to show only macros in completion if you type `!`: <img width="722" alt="image" src="https://user-images.githubusercontent.com/2690773/64736987-8b8ea180-d4f4-11e9-8355-2ce4f83b7aa8.png"> <img width="732" alt="image" src="https://user-images.githubusercontent.com/2690773/64737214-ffc94500-d4f4-11e9-946e-1ba2db1c7fb1.png"> Additionally, automatic formatting hooks had adjusted two `help.rs` files, I've added them as a last commit to the PR even though they are not really related. Co-authored-by: Kirill Bulatov <[email protected]>
| * | Complete vec macros with square bracketsKirill Bulatov2019-09-122-3/+36
| | |
| * | Fix the formatting issuesKirill Bulatov2019-09-121-45/+45
| | |
| * | Add `!` to the macro completion labelKirill Bulatov2019-09-124-20/+24
| | |
| * | Complete macros parenthesisKirill Bulatov2019-09-124-9/+9
| | |
* | | Merge #1827bors[bot]2019-09-121-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1827: fix panic when fetching generics r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | fix panic when fetching genericsAleksey Kladov2019-09-121-5/+5
| | | | | | | | | | | | | | | | due to macro expansion, the root node is not always a file
* | | | Merge #1826bors[bot]2019-09-122-2/+6
|\| | | | |/ / |/| | | | | | | | | | | | | | | | | 1826: don't break parser error recovery in presence of macros r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | don't break parser error recovery in presence of macrosAleksey Kladov2019-09-122-2/+6
|/ / | | | | | | | | | | | | Parser has the invariant that `{}` are balanced. Previous code tried (unsucesfuly) maintain the same invariant for `$()` as well, but it was done in a rather ad-hoc manner: it's not at all obvious that it is possible to maintain both invariants!
* | Merge #1825bors[bot]2019-09-123-82/+116
|\ \ | | | | | | | | | | | | | | | | | | | | | 1825: add quiet mode to analysis-stats r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | add quiet mode to analysis-statsAleksey Kladov2019-09-123-82/+116
|/ /
* | Merge #1824bors[bot]2019-09-121-2/+8
|\ \ | |/ |/| | | | | | | | | | | 1824: analysis stats uses positional arg again r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * analysis stats uses positional arg againAleksey Kladov2019-09-121-2/+8
|/
* Merge #1796bors[bot]2019-09-1110-8/+334
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1796: Support completion for macros r=matklad a=uHOOCCOOHu This is based on #1795 , and fixes #1727 Also prettify hover text of macros. Some screenshorts below: Completion in item place. <img width="416" alt="Screenshot_20190910_134056" src="https://user-images.githubusercontent.com/14816024/64587159-fa72da00-d3d0-11e9-86bb-c98f169ec08d.png"> After pressing `tab`. <img width="313" alt="Screenshot_20190910_134111" src="https://user-images.githubusercontent.com/14816024/64587160-fa72da00-d3d0-11e9-9464-21e3f6957bd7.png"> Complete macros from `std`. <img width="588" alt="Screenshot_20190910_134147" src="https://user-images.githubusercontent.com/14816024/64587161-fb0b7080-d3d0-11e9-866e-5161f0d1b546.png"> Hover text. <img width="521" alt="Screenshot_20190910_134242" src="https://user-images.githubusercontent.com/14816024/64587162-fb0b7080-d3d0-11e9-8f09-ad17e3f6702a.png"> Co-authored-by: uHOOCCOOHu <[email protected]>
| * Split out `complete_macro_in_item_position`uHOOCCOOHu2019-09-113-37/+52
| |
| * Fix typouHOOCCOOHu2019-09-114-4/+4
| |
| * Show macro definition in hover textuHOOCCOOHu2019-09-101-3/+21
| |
| * Support completion for macrosuHOOCCOOHu2019-09-104-2/+295
| |
* | Merge #1797bors[bot]2019-09-112-12/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1797: Use VSCode fs API's in extension r=matklad a=LDSpits This will close #1670. I've replaced the `CargoWatcher`s `Cargo.toml` check with a version that uses the `fs` API of vscode. While making this I've identified an issue with the detection of the `cargo.toml`, we can only load projects where the cargo.toml is in the root of the workspace. but that's a separate issue 😄 Co-authored-by: Lucas Spits <[email protected]>
| * | Update minimal required vscode version to 1.37Lucas Spits2019-09-101-1/+1
| | |
| * | Replace watcher file existence check with vscode.fs versionLucas Spits2019-09-091-11/+10
| | |
* | | Merge #1812bors[bot]2019-09-111-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1812: clarify sublime instructions r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | clarify sublime instructionsAleksey Kladov2019-09-111-1/+3
| | | | | | | | | | | | | | | | closes #1811
* | | | Merge #1810bors[bot]2019-09-108-130/+62
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 1810: cleanup dollar handling in expressions r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | cleanup expansion to item listAleksey Kladov2019-09-105-34/+11
| | | |
| * | | cleanup dollar handling in expressionsAleksey Kladov2019-09-103-96/+51
|/ / /
* | | Merge #1806bors[bot]2019-09-107-114/+297
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1806: refactor(args): Switch to pico-args r=matklad a=Geobert Fixes https://github.com/rust-analyzer/rust-analyzer/issues/1768 Co-authored-by: Geobert Quach <[email protected]>
| * | | refactor(args): Apply commentsGeobert Quach2019-09-104-161/+116
| | | |
| * | | refactor(args): Switch to pico-args in ra_toolsGeobert Quach2019-09-105-59/+153
| | | |
| * | | refactor(args): Switch to pico-argsGeobert Quach2019-09-104-79/+213
| | |/ | |/|
* | | Merge #1809bors[bot]2019-09-102-52/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1809: add fragmets to expansion r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | | simiplifyAleksey Kladov2019-09-101-25/+2
| | | |
| * | | add fragmets to expansionAleksey Kladov2019-09-102-36/+42
|/ / /
* | | Merge #1801bors[bot]2019-09-1019-337/+497
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 1801: WIP: switch to fully decomposed tokens internally r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | add a jointness parser testsAleksey Kladov2019-09-102-0/+55
| | | | | | | | | | | | cc https://github.com/rust-lang/rust/issues/64242
| * | "Fix" mbe to work with decomposed tokensAleksey Kladov2019-09-106-84/+46
| | | | | | | | | | | | We regressed $i * 2 where $i = 1 + 1, need to fix that!
| * | WIP: switch to fully decomposed tokens internallyAleksey Kladov2019-09-1012-280/+423
|/ /
* | Merge #1803bors[bot]2019-09-0916-132/+138
|\ \ | | | | | | | | | | | | | | | | | | | | | 1803: introduce bump as a better-checked alternative to bump_any r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | introduce bump as a better-checked alternative to bump_anyAleksey Kladov2019-09-092-2/+8
| | |
| * | rename bump -> bump_anyAleksey Kladov2019-09-0916-132/+132
|/ /
* | Merge #1795bors[bot]2019-09-097-239/+393
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1795: Make macro scope a real name scope and fix some details r=matklad a=uHOOCCOOHu This PR make macro's module scope a real name scope in `PerNs`, instead of handling `Either<PerNs, MacroDef>` everywhere. In `rustc`, the macro scope behave exactly the same as type and value scope. It is valid that macros, types and values having exact the same name, and a `use` statement will import all of them. This happened to module `alloc::vec` and macro `alloc::vec!`. So `Either` is not suitable here. There is a trap that not only does `#[macro_use]` import all `#[macro_export] macro_rules`, but also imports all macros `use`d in the crate root. In other words, it just _imports all macros in the module scope of crate root_. (Visibility of `use` doesn't matter.) And it also happened to `libstd` which has `use alloc_crate::vec;` in crate root to re-export `alloc::vec`, which it both a module and a macro. The current implementation of `#[macro_use] extern crate` doesn't work here, so that is why only macros directly from `libstd` like `dbg!` work, while `vec!` from `liballoc` doesn't. This PR fixes this. Another point is that, after some tests, I figure out that _`macro_rules` does NOT define macro in current module scope at all_. It defines itself in legacy textual scope. And if `#[macro_export]` is given, it also is defined ONLY in module scope of crate root. (Then being `macro_use`d, as mentioned above) (Well, the nightly [Declarative Macro 2.0](https://github.com/rust-lang/rust/issues/39412) simply always define in current module scope only, just like normal items do. But it is not yet supported by us) After this PR, in my test, all non-builtin macros are resolved now. (Hover text for documentation is available) So it fixes #1688 . Since compiler builtin macros are marked as `#[rustc_doc_only_macro]` instead of `#[macro_export]`, we can simply tweak the condition to let it resolved, but it may cause expansion error. Some critical notes are also given in doc-comments. <img width="447" alt="Screenshot_20190909_223859" src="https://user-images.githubusercontent.com/14816024/64540366-ac1ef600-d352-11e9-804f-566ba7559206.png"> Co-authored-by: uHOOCCOOHu <[email protected]>
| * | StripuHOOCCOOHu2019-09-092-12/+3
| | |
| * | Make macro scope a real name scopeuHOOCCOOHu2019-09-098-236/+399
| | | | | | | | | | | | Fix some details about module scoping
* | | Merge #1800bors[bot]2019-09-092-16/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1800: make all traits non-enumerable r=flodiebold a=nikomatsakis As discussed on Zulip, this actually matches the present behavior of rustc. r? @flodiebold Co-authored-by: Niko Matsakis <[email protected]>
| * | | modify testsNiko Matsakis2019-09-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some method resolution tests now yield `{unknown}` where they did not before. Other tests now succeed, likely because this is helping the solver steer its efforts.
| * | | also make "unknown" case non-enumerableNiko Matsakis2019-09-091-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 15:11:37 +0000