aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix nitpicksAleksei Sidorov2020-09-042-24/+14
| | | |
| * | | Resolve most of corner casesAleksei Sidorov2020-09-032-12/+124
| | | |
| * | | Initial implementation of the #5085 issueAleksei Sidorov2020-09-034-0/+145
| | | |
* | | | Merge #5935bors[bot]2020-09-046-535/+744
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5935: Rewrite import insertion r=matklad a=Veykril This is my attempt at refactoring the import insertion #3947. I hope what I created here is somewhat in line with what was requested, it wouldn't surprise me . `common_prefix` is a copy from `merge_imports.rs` so those should be unified somewhere, `try_merge_trees` is also copied from there but slighly modified to take the `MergeBehaviour` enum into account. `MergeBehaviour` should in the end become a configuration option, and the order if `ImportGroup` probably as well? I'm not too familiar with the assist stuff and the like which is why I dont know what i have to do with `insert_use_statement` and `find_insert_use_container` for now. I will most likely add more test cases in the end as well as I currently only tried to hit every path in `find_insert_position`. Some of the merge tests also fail atm due to them not sorting what they insert. There is also this test case I'm not sure if we want to support it. I would assume we want to? https://github.com/rust-analyzer/rust-analyzer/pull/5935/files#diff-6923916dd8bdd2f1ab4b984adacd265fR540-R547 The entire module was rewritten so looking at the the file itself is probably better than looking at the diff. Regarding the sub issues of #3947: - #3301: This is fixed with the rewrite, what this implementation does is that it scans through the first occurence of groupings and picks the appropriate one out. This means the user can actually rearrange the groupings on a per file basis to their liking. If a group isnt being found it is inserted according to the `ImportGroup` variant order(Would be nice if this was configurable I imagine). - #3831: This should be fixed with the introduced `MergeBehaviour` enum and it's `Last` variant. - #3946: This should also be [fixed](https://github.com/rust-analyzer/rust-analyzer/pull/5935/files#diff-6923916dd8bdd2f1ab4b984adacd265fR87) - #5795: This is fixed in the sense that the grouping search picks the first group that is of the same kind as the import that is being added. So if there is a random import in the middle of the program it should only be considered if there is no group of the same kind in the file already present. - the last point in the list I havent checked yet, tho I got the feeling that it's not gonna be too simple as that will require knowledge of whether in this example `ast` is a crate or the module that is already imported. Co-authored-by: Lukas Wirth <[email protected]>
| * | | | Add extra insert_use test for pub(crate) re-export handlingLukas Wirth2020-09-032-12/+19
| | | | |
| * | | | Disable insert_import in extract_struct_from_enum_variant until its fixedLukas Wirth2020-09-031-0/+4
| | | | |
| * | | | Fix import insertion breaking nested modulesLukas Wirth2020-09-035-62/+117
| | | | |
| * | | | Fix inserting imports in front of inner attributesLukas Wirth2020-09-032-3/+54
| | | | |
| * | | | Replace insert_use_statement with the new insert_useLukas Wirth2020-09-034-54/+68
| | | | |
| * | | | Impl make::blank_lineLukas Wirth2020-09-033-27/+20
| | | | |
| * | | | Use mark to check that paths that are too long will not be mergedLukas Wirth2020-09-031-0/+13
| | | | |
| * | | | Tidy up tests and apply suggested changesLukas Wirth2020-09-031-72/+107
| | | | |
| * | | | Add more import insertion testsLukas Wirth2020-09-031-3/+68
| | | | |
| * | | | Begin refactor of import insertionLukas Wirth2020-09-031-468/+440
| |/ / /
* | | | Merge #5948bors[bot]2020-09-033-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 5948: Up proc-macro2 to 1.20 r=matklad a=kjeremy This changes the way Display is implemented Co-authored-by: kjeremy <[email protected]>
| * | | Up proc-macro2 to 1.20kjeremy2020-09-033-5/+5
|/ / / | | | | | | | | | This changes the way Display is implemented
* | | Merge #5942bors[bot]2020-09-031-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5942: Actually assert disjointness r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Actually assert disjointnessAleksey Kladov2020-09-031-3/+6
|/ / /
* | | Merge #5941bors[bot]2020-09-032-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5941: Unify naming r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Unify namingAleksey Kladov2020-09-032-5/+5
| | | |
* | | | Merge #5937bors[bot]2020-09-032-11/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 5937: Chalk 0.25 r=matklad a=kjeremy Picks up flodiebold's infinite loop fix Co-authored-by: kjeremy <[email protected]>
| * | | Chalk 0.25kjeremy2020-09-022-11/+11
| |/ / | | | | | | | | | Picks up flodiebold's infinite loop fix
* | | Merge #5939bors[bot]2020-09-031-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5939: default `checkOnSave.enable` to `true` in server r=matklad a=euclio Fixes #5905. Co-authored-by: Andy Russell <[email protected]>
| * | default `checkOnSave.enable` to `true` in serverAndy Russell2020-09-021-1/+1
|/ /
* | Merge #5930bors[bot]2020-09-0213-61/+51
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5930: Migrate to the latest Semantic Tokens Proposal for LSP 3.16 r=matklad a=kjeremy This stabilizes call hierarchy and semantic tokens features on the client side and changes the server-side semantic tokens protocol to match the latest proposal for 3.16. The server-side change will break clients depending on the earlier semantic tokens draft. Fixes #4942 Co-authored-by: kjeremy <[email protected]>
| * | Switch to upstream ENUM_MEMBERkjeremy2020-09-022-2/+2
| | |
| * | Move to vscode-languageclient 7.0.0-next.9kjeremy2020-09-0213-59/+49
| | | | | | | | | | | | Stabilizes call hierarchy and semantic tokens features.
* | | Merge #5936bors[bot]2020-09-021-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5936: cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | cargo updatekjeremy2020-09-021-4/+4
|/ /
* | Merge #5931bors[bot]2020-09-012-158/+184
|\ \ | | | | | | | | | | | | | | | | | | | | | 5931: Update vscode to 1.47 and update the rest of our npm packages r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | Update the rest of our node packageskjeremy2020-09-012-137/+163
| | |
| * | Bump minimum vscode to 1.47kjeremy2020-09-012-21/+21
| | |
* | | Merge #5927bors[bot]2020-09-011-0/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5927: Document VS Code setting needed for on-typing assists r=matklad a=arzg Fixes #5925. Co-authored-by: Aramis Razzaghipour <[email protected]>
| * | Document VS Code setting needed for on-typing assistsAramis Razzaghipour2020-09-011-0/+8
| | |
* | | Merge #5929bors[bot]2020-09-012-69/+211
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 5929: Upgrade mocha from `npm audit fix` r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | Upgrade mocha from `npm audit fix`kjeremy2020-09-012-69/+211
|/ /
* | Merge #5926bors[bot]2020-09-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 5926: Bump token expansion limit r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Bump token expansion limitAleksey Kladov2020-09-011-1/+1
|/ / | | | | | | | | | | | | We hit this for redis crate, reported at Reported at https://www.reddit.com/r/rust/comments/ikfsf8/rustanalyzer_doesnt_work_with_the_redis_crate/
* | Merge #5923bors[bot]2020-09-012-10/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 5923: "How I survived Git" tips r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | "How I survived Git" tipsAleksey Kladov2020-09-012-10/+32
|/ /
* | Merge #5862bors[bot]2020-09-012-0/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | 5862: Add a test that forbids merge commits r=matklad a=dragfire Fixes #5854 Co-authored-by: dragfire <[email protected]>
| * | Add a test that forbids merge commitsdragfire2020-08-312-0/+17
|/ /
* | Merge #5921bors[bot]2020-08-311-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | 5921: Don't publish every day and do it only for release r=matklad a=pksunkara I think this is a good balance. Co-authored-by: Pavan Kumar Sunkara <[email protected]>
| * | Don't publish every day and do it only for releasePavan Kumar Sunkara2020-08-311-2/+2
|/ /
* | Merge #5920bors[bot]2020-08-312-27/+18
|\ \ | |/ |/| | | | | | | | | | | | | | | 5920: Reduce path_from_text usage r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Reduce path_from_text usageAleksey Kladov2020-08-312-13/+18
| |
| * Remove dead codeAleksey Kladov2020-08-311-14/+0
|/
* Merge #5914bors[bot]2020-08-304-45/+12
|\ | | | | | | | | | | | | | | 5914: Replace custom `xtask::not_bash::fs2` setup with fs_err crate r=matklad a=Veetaha Co-authored-by: Veetaha <[email protected]>
| * Replace custom `not_bash::fs2` setup with fs_err crateVeetaha2020-08-294-45/+12
| |
| |
| \
*-. \ Merge #5910 #5912bors[bot]2020-08-294-4/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5910: Fix some typos r=matklad a=SomeoneToIgnore 5912: Remove fixme from inlay_hints.ts r=matklad a=Veetaha I have reevaluated the fixme and it doesn't seem necessary to pass an array of files to the inlay hints request. This will (a) make the request more compilcated (b), make us wait for inlay hints for `all` active editors resolve at once before rendering and (c) doesn't seem required because 99% of the time there is a single active editor in the IDE Co-authored-by: Kirill Bulatov <[email protected]> Co-authored-by: Veetaha <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 08:14:48 +0000