aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ra_cargo_watch: log more errorsveetaha2020-03-211-3/+16
|
* Merge #3672bors[bot]2020-03-213-26/+21
|\ | | | | | | | | | | | | | | | | | | | | | | 3672: gen_assists_docs skip hidden files r=JoshMcguigan a=JoshMcguigan Fixes #3670 Skips hidden files when generating assist docs, which fixes an issue where the tests would fail while an editor has created a temp file in the assists directory. There is similar logic [here](https://github.com/rust-analyzer/rust-analyzer/blob/2720e2374be951bb762ff2815dd67c7ffe3419b7/xtask/tests/tidy-tests/main.rs#L157), although in that case the `DirEntry` is a `walkdir::DirEntry` rather than a `fs::DirEntry`. Also, it's not immediately clear that it is worth moving this functionality to somewhere accessible from both of these places and creating dependencies in this way. Let me know if this is off the mark. Co-authored-by: Josh Mcguigan <[email protected]>
| * gen_assists_docs skip hidden filesJosh Mcguigan2020-03-213-26/+21
| |
* | Merge #3674bors[bot]2020-03-211-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | 3674: Use target-name for crate-name in Crate graph building r=matklad a=edwin0cheng Fix #3667 Co-authored-by: Edwin Cheng <[email protected]>
| * | Use target-name for crate-nameEdwin Cheng2020-03-211-3/+3
|/ /
* | Merge #3671bors[bot]2020-03-213-3/+56
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 3671: Add identity expansion checking in ill-form expansion r=flodiebold a=edwin0cheng This PR try to add more checking code in error case in macro expansion. The bug in #3642 is introduced by #3580 , which allow ill-form macro expansion in *all* kind of macro expansions. In general we should separate hypothetical macro expansion and the actual macro expansion call. However, currently the `Semantic` workflow we are using only support single macro expansion type, we might want to review it and make it works in both ways. (Maybe add a field in `MacroCallLoc` for differentiation) Fix #3642 Co-authored-by: Edwin Cheng <[email protected]>
| * Move test to hir_tyEdwin Cheng2020-03-212-30/+31
| |
| * Fix typoEdwin Cheng2020-03-211-1/+1
| |
| * Add identity expansion checkingEdwin Cheng2020-03-213-3/+55
| |
* | Merge #3668bors[bot]2020-03-211-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3668: disable invert-if assist for if-let r=matklad a=JoshMcguigan Fixes #3281 This disables the invert-if assist for if-let expressions, fixing the bug reported in #3281. While in the exact case reported in #3281, `if let Some(_) = foo { ...`, it would be possible to invert the if-let pattern, in most cases it will not be possible, so disabling this assist for if-let expressions seems reasonable. Co-authored-by: Josh Mcguigan <[email protected]>
| * | disable invert if assist for if-let to fix #3281Josh Mcguigan2020-03-211-0/+13
|/ /
* | Merge #3665bors[bot]2020-03-211-2/+0
|\ \ | |/ |/| | | | | | | | | | | 3665: vscode: remove unnecessary code r=matklad a=Veetaha This cancel is unnecessary since we cancel the previous inlay hints requests in `fetchHints()` method itself. This is not a hard error, we just called cancel() 2 times. Co-authored-by: Veetaha <[email protected]>
| * vscode: remove unnecessary codeVeetaha2020-03-201-2/+0
|/ | | This cancel is unnecessary since we cancel the previous inlay hints requests in `fetchHints()` method itself. This is not a hard error, we just called cancel() 2 times.
* Merge #3663bors[bot]2020-03-207-25/+10
|\ | | | | | | | | | | | | | | | | | | | | 3663: Make from-source install use cargo installed binary by default r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * :arrow_up: npmAleksey Kladov2020-03-202-4/+4
| |
| * Make from-source install use cargo installed binary by defaultAleksey Kladov2020-03-206-21/+6
|/
* Merge #3623bors[bot]2020-03-201-25/+177
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3623: 'Fill match arms' should work with existing match arms r=matklad a=slyngbaek Addresses #3039 This essentially adds missing match arms. The algorithm for this can get complicated rather quickly so bail in certain conditions and rely on a PlaceholderPat. The algorighm works as such: - Iterate through the Enum Def Variants - Attempt to see if the variant already exists as a match arm - If yes, skip the enum variant. If no, include it. - If it becomes complicated, rather than exhaustively deal with every branch, mark it as a "partial match" and simply include the placeholder. Conditions for "complication": - The match arm contains a match guard - Any kind of nested destrucuring Order the resulting merged match branches as such: 1. Provided match arms 2. Missing enum variant branch arms 3. End with Placeholder if required - Add extra tests Co-authored-by: Steffen Lyngbaek <[email protected]>
| * Address nits and suggestions.Steffen Lyngbaek2020-03-191-140/+32
| | | | | | | | | | Simplify the logic a lot by removing the check for a placeholder pat. This means the auto-fill no longer returns a compile-able value.
| * Don't show assist if all arms are presentSteffen Lyngbaek2020-03-191-33/+37
| |
| * 'Fill match arms' should work with existing match armsSteffen Lyngbaek2020-03-191-25/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #3039 This essentially adds missing match arms. The algorithm for this can get complicated rather quickly so bail in certain conditions and rely on a PlaceholderPat. The algorighm works as such: - Iterate through the Enum Def Variants - Attempt to see if the variant already exists as a match arm - If yes, skip the enum variant. If no, include it. - If it becomes complicated, rather than exhaustively deal with every branch, mark it as a "partial match" and simply include the placeholder. Conditions for "complication": - The match arm contains a match guard - Any kind of nested destrucuring Order the resulting merged match branches as such: 1. Provided match arms 2. Missing enum variant branch arms 3. End with Placeholder if required - Add extra tests
* | Merge #3662bors[bot]2020-03-203-4/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3662: Support arbitrary discriminants r=matklad a=matklad Closes #3661 bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Support arbitrary discriminantsAleksey Kladov2020-03-203-4/+37
| |/ | | | | | | Closes #3661
* | Merge #3541bors[bot]2020-03-203-3/+143
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 3541: Completition for type name? #3418 r=matklad a=slyngbaek Iterate through TupleStructPat's until a MatchArm if one exists. Store in a new is_pat_bind_and_path bool and allow the `complete_scope` to find matches. Added some tests to ensure it works in simple and nested cases. Co-authored-by: Steffen Lyngbaek <[email protected]>
| * Remove constSteffen Lyngbaek2020-03-193-6/+48
| | | | | | | | | | - Add test for @ matching - Address comments
| * Fixes to more accurately give complete_scope completionsSteffen Lyngbaek2020-03-193-15/+38
| | | | | | | | | | | | | | - Exclude const, static, functions form is_pat_binding_and_path (there might be more?) - Add a check to filter out Record Fields - Fix tests
| * - Exclude Local Scope for BindPatsSteffen Lyngbaek2020-03-192-58/+16
| | | | | | | | | | - Exclude BindPats with @ or ref - Remove outdated test and add one testing for ref
| * Completition for type name? #3418Steffen Lyngbaek2020-03-192-3/+120
|/ | | | | | | | Iterate through TupleStructPat's until a MatchArm if one exists. Store in a new is_pat_bind_and_path bool and allow the `complete_scope` to find matches. Added some tests to ensure it works in simple and nested cases.
* Merge #3656bors[bot]2020-03-1917-185/+175
|\ | | | | | | | | | | | | | | | | | | | | | | 3656: Simplify arenas r=matklad a=matklad At the moment, Arena is paranetrized by two types: index and data. The original motivation was to allow index to be defined in the downstream crate, so that you can add inherent impls to the index. However, it seems like we've never actually used that capability, so perhaps we should switch to a generic Index impl? This PR tries this out, switching only `raw.rs` and parts of `hir_def`. wdyt? Co-authored-by: Aleksey Kladov <[email protected]>
| * Simplify Arena to use a generic indexAleksey Kladov2020-03-1917-185/+175
|/
* Merge #3658bors[bot]2020-03-194-109/+84
|\ | | | | | | | | | | | | | | | | | | | | 3658: More direct CargoWorkspace r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Simplify SysrootAleksey Kladov2020-03-192-22/+20
| |
| * More direct CargoWorkspaceAleksey Kladov2020-03-193-87/+64
|/
* Merge #3655bors[bot]2020-03-192-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | 3655: Downgrade vscode-langaugeclient r=matklad a=matklad Looks like it broke completion :( bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Downgrade vscode-langaugeclientAleksey Kladov2020-03-192-4/+4
|/ | | | Looks like it broke completion :(
* Merge #3652bors[bot]2020-03-196-13/+17
|\ | | | | | | | | | | | | | | | | | | | | 3652: Cleanup imports r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Cleanup importsAleksey Kladov2020-03-196-13/+17
| |
* | Merge #3651bors[bot]2020-03-191-20/+52
|\| | | | | | | | | | | | | | | | | | | | | 3651: Merge nested use trees r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Merge nested use treesAleksey Kladov2020-03-191-20/+52
| |
* | Merge #3650bors[bot]2020-03-193-13/+14
|\| | | | | | | | | | | | | | | | | | | | | 3650: Generalize r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * GeneralizeAleksey Kladov2020-03-193-13/+14
| |
* | Merge pull request #3641 from darinmorrison/rollup-typescriptAleksey Kladov2020-03-192-1/+4
|\ \ | |/ |/| Some improvements to rollup and ts config
| * Target es2019 (code 1.43 uses chromium 78)Darin Morrison2020-03-181-1/+1
| |
| * Add typing annotations for rollup configDarin Morrison2020-03-181-0/+3
| |
* | Merge #3649bors[bot]2020-03-192-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3649: :arrow_up: npm r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | :arrow_up: npmAleksey Kladov2020-03-192-5/+5
|/ /
* | Don't trigger stable release when pushing to nightly branchAleksey Kladov2020-03-191-5/+5
| |
* | Merge pull request #3635 from matklad/tagsAleksey Kladov2020-03-196-34/+27
|\ \ | | | | | | Simplify extension tag sniffing
| * | Simplify extension tag sniffingAleksey Kladov2020-03-196-34/+27
|/ /
* | Merge #3629bors[bot]2020-03-1913-691/+265
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3629: Alternative aproach to plugin auto update r=matklad a=matklad This is very much WIP (as in, I haven't run this once), but I like the result so far. cc @Veetaha The primary focus here on simplification: * local simplification of data structures and control-flow: using union of strings instead of an enum, using unwrapped GitHub API responses * global simplification of control flow: all logic is now in `main.ts`, implemented as linear functions without abstractions. This is stateful side-effective code, so arguments from [Carmack](http://number-none.com/blow/john_carmack_on_inlined_code.html) very much apply. We need all user interractions, all mutations, and all network requests to happen in a single file. * as a side-effect of condensing everything to functions, we can get rid of various enums. The enums were basically a reified control flow: ``` enum E { A, B } fn foo() -> E { if cond { E::A } else { E::B } } fn bar(e: E) { match e { E::A => do_a(), E::B => do_b(), } } ==>> fn all() { if cond { do_a() } else { do_b() } } ``` * simplification of model: we don't need to reinstall on settings update, we can just ask the user to reload, we don't need to handle nightly=>stable fallback, we can ask the user to reinstall extension, (todo) we don't need to parse out the date from the version, we can use build id for nightly and for stable we can write the info directly into package.json. Co-authored-by: Aleksey Kladov <[email protected]>
| * | Rewrite auto-updateAleksey Kladov2020-03-1913-691/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything now happens in main.ts, in the bootstrap family of functions. The current flow is: * check everything only on extension installation. * if the user is on nightly channel, try to download the nightly extension and reload. * when we install nightly extension, we persist its release id, so that we can check if the current release is different. * if server binary was not downloaded by the current version of the extension, redownload it (we persist the version of ext that downloaded the server).