aboutsummaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
* Merge #6472bors[bot]2020-11-097-3/+95
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6472: Add `static` modifier for associated functions r=matklad a=p3achyjr Adds static semantic token modifier to associated functions, resolves #6194 ## Info - Associated functions are more-or-less equivalent to static methods in other languages. This PR checks, for each function, whether that function has a self_param, and whether it's enclosed in a trait/impl. ## Changes - Added method ```is_associated``` to code_model::Function. This basically gets the source from the ast, and checks whether the enclosing scope is an impl or trait. - Added `static` to HighlightModifiers - Added unit test ## Tests - Ran ```cargo test``` Co-authored-by: Anatol Liu <[email protected]>
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-092-16/+3
| | | | | | | | | | | | refactor logic into code_model.rs address comments
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-082-6/+2
| | | | | | | | | | | | refactor logic into code_model.rs address comments
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-051-5/+1
| | | | | | | | | | | | refactor logic into code_model.rs address comments
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-051-1/+1
| | | | | | | | refactor logic into code_model.rs
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-052-17/+22
| | | | | | | | refactor logic into code_model.rs
| * Add static semantic token modifier for associated functions with no &selfAnatol Liu2020-11-058-2/+110
| |
* | . is an operatorAleksey Kladov2020-11-095-28/+30
| | | | | | | | closes #6498
* | Fix panic when extracting structAleksey Kladov2020-11-092-3/+34
| |
* | Support multi-file assist testsAleksey Kladov2020-11-092-6/+56
| |
* | Fix debug for SyntaxRewriterAleksey Kladov2020-11-091-1/+4
| |
* | Merge #6506bors[bot]2020-11-095-1172/+1256
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6506: Cleanup assists r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Use standard style for test codeAleksey Kladov2020-11-091-568/+635
| | |
| * | More consistent namingAleksey Kladov2020-11-093-81/+81
| | |
| * | More consistent namingAleksey Kladov2020-11-093-66/+83
| | |
* | | Merge #6465bors[bot]2020-11-091-9/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 6465: Support multiple file edits in AssistBuilder r=matklad a=Veykril Fixes #6459 Co-authored-by: Lukas Wirth <[email protected]>
| * | Support multiple file edits in AssistBuilderLukas Wirth2020-11-041-9/+16
| | |
* | | Merge #6501bors[bot]2020-11-093-35/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6501: Remove text_edit_builder api from AssistBuilder r=matklad a=Veykril Also fixes a small bug in `expand_glob_import` in regards to the very nice looking `something::{*}` import when only one item was used. Before it would duplicate the path and just append it, causing the following wrong import `something::something::UsedItem`. Co-authored-by: Lukas Wirth <[email protected]>
| * | | Remove text_edit_builder api from AssistBuilderLukas Wirth2020-11-083-35/+51
| | | |
* | | | Add some postfix snippetPavan Kumar Sunkara2020-11-081-0/+12
| | | |
* | | | Merge #6476bors[bot]2020-11-074-110/+239
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6476: Add missing AssocItems in add_custom_impl assist r=matklad a=Veykril ```rust use std::fmt; #[derive(Debu<|>g)] struct Foo { bar: String, } ``` -> ```rust use std::fmt; struct Foo { bar: String, } impl fmt::Debug for Foo { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { ${0:todo!()} } } ``` Co-authored-by: Lukas Wirth <[email protected]>
| * | | | Add missing AssocItems in add_custom_impl assistLukas Wirth2020-11-054-110/+239
| | |_|/ | |/| |
* | | | Minimize convert_integer_literal testsm-ysk2020-11-071-368/+2
| |/ / |/| |
* | | Cleanup APIAleksey Kladov2020-11-065-96/+84
| | |
* | | Merge #6485bors[bot]2020-11-0652-189/+155
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6485: Remove RAW literals r=matklad a=matklad bors r+ 🤖 closes https://github.com/rust-analyzer/rust-analyzer/issues/6308 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | SimplifyAleksey Kladov2020-11-066-45/+25
| | | |
| * | | Kill RAW_ literalsAleksey Kladov2020-11-0651-153/+139
| | | | | | | | | | | | | | | | | | | | Syntactically, they are indistinguishable from non-raw versions, so it doesn't make sense to separate then *at the syntax* level.
* | | | Merge #6477bors[bot]2020-11-063-0/+352
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 6477: Add infer_function_return_type assist r=matklad a=Veykril This adds an assist to insert a functions return type if it hasn't been specified yet by inferring it from the functions tail expression. This assist only becomes active if the cursor is on the tail expression. See https://github.com/rust-analyzer/rust-analyzer/issues/6303#issuecomment-714657326 Co-authored-by: Lukas Wirth <[email protected]>
| * | | Adjust test-texts in infer_function_return_typeLukas Wirth2020-11-061-78/+78
| | | |
| * | | Enable infer_function_return_type in return-type positionLukas Wirth2020-11-061-29/+129
| | | |
| * | | Wrap non-block expressions in closures with a blockLukas Wirth2020-11-061-12/+31
| | | |
| * | | Ignore unit expressions in infer_function_return_type assistLukas Wirth2020-11-061-3/+13
| | | |
| * | | Support closures in infer_function_return_type assistLukas Wirth2020-11-061-19/+114
| | | |
| * | | Add infer_function_return_type assistLukas Wirth2020-11-063-0/+128
| |/ /
* | | Minor, cleanup styleAleksey Kladov2020-11-061-50/+64
| | |
* | | Merge #6480bors[bot]2020-11-061-14/+107
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6480: Support closure in change_return_type_to_result assist r=Veykril a=Veykril Co-authored-by: Lukas Wirth <[email protected]>
| * | | Support closure in change_return_type_to_result assistLukas Wirth2020-11-061-14/+107
| |/ /
* | | More orthogonal APIAleksey Kladov2020-11-062-48/+38
| | |
* | | Move int parsing to IntNumber tokenAleksey Kladov2020-11-064-77/+92
| | |
* | | Better importsAleksey Kladov2020-11-061-11/+11
| | |
* | | Generate token for ints and floatsAleksey Kladov2020-11-061-0/+42
| | |
* | | Ignore RUST_SRC_PATH if it is set to invalid valueAleksey Kladov2020-11-061-2/+6
|/ / | | | | | | | | | | Folks report a ton of hard-to-diagnose issues, the solution for which is "unset RUST_SRC_PATH". Let's just ignore RUST_SRC_PATH when it won't work anyway!
* | Merge #6467bors[bot]2020-11-044-18/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 6467: Don't stack overflow on circular modules r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Don't stack overflow on circular modulesAleksey Kladov2020-11-044-18/+62
| |/ | | | | | | closes #6453
* | Merge #6456bors[bot]2020-11-043-41/+137
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6456: Support record variants in extract_struct_from_enum_variant r=matklad a=Veykril As requested :) This also prevents the assist from being disabled if a definition in the value namespace exists with the same name as our new struct since that won't cause a collision #4468 Co-authored-by: Lukas Wirth <[email protected]>
| * | Support struct variants in extract_struct_from_enum_variantLukas Wirth2020-11-033-49/+101
| | |
| * | only check type namespace in extract_struct_from_enum_variant for collisionsLukas Wirth2020-11-031-9/+53
| | |
* | | Merge #6458bors[bot]2020-11-041-38/+114
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 6458: Qualify trait impl created by add_custom_impl assist r=matklad a=Veykril When we find at least one trait with the same name as the derive accessible from the current module we now generate a qualified path to that trait in the generated impl. If we don't find any we just do what was done before and emit the trait name in the generated impl. Co-authored-by: Lukas Wirth <[email protected]>
| * | Qualify trait impl created by add_custom_impl assistLukas Wirth2020-11-031-38/+114
| |/
* | Merge #6454bors[bot]2020-11-033-136/+137
|\ \ | |/ |/| | | | | | | | | | | | | 6454: Fix overflow panic in convert_interger_literal assist r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>