aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #6512bors[bot]2020-11-091-36/+89
|\ | | | | | | | | | | | | | | | | | | | | 6512: Don't replace parent node when inserting as first child in algo::diff r=SomeoneToIgnore a=Veykril This makes the diff a bit more detailed. See https://github.com/rust-analyzer/rust-analyzer/pull/6287#issuecomment-723889267 for context cc @SomeoneToIgnore Co-authored-by: Lukas Wirth <[email protected]>
| * Don't replace parent node when inserting as first child in algo::diffLukas Wirth2020-11-091-36/+89
| |
* | Merge #6516bors[bot]2020-11-091-5/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | 6516: Textmate grammar: prevent `/**/` from matching block doc comments r=dustypomerleau a=dustypomerleau Fixes #6493. Co-authored-by: Dusty Pomerleau <[email protected]>
| * | fix: prevent `/**/` from matching block doc commentsDusty Pomerleau2020-11-091-5/+10
|/ /
* | 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
| | |
* | | Merge #6511bors[bot]2020-11-095-28/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6511: . is an operator r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | . is an operatorAleksey Kladov2020-11-095-28/+30
|/ / / | | | | | | | | | closes #6498
* | | Merge #6510bors[bot]2020-11-092-3/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6510: Fix panic when extracting struct r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix panic when extracting structAleksey Kladov2020-11-092-3/+34
|/ / /
* | | Merge #6509bors[bot]2020-11-092-6/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6509: Support multi-file assist tests r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Support multi-file assist testsAleksey Kladov2020-11-092-6/+56
| | | |
* | | | Merge #6508bors[bot]2020-11-091-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6508: Fix debug for SyntaxRewriter r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix debug for SyntaxRewriterAleksey Kladov2020-11-091-1/+4
|/ / /
* | | Merge #6506bors[bot]2020-11-096-1175/+1261
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-69/+88
| | | |
* | | | Merge #6465bors[bot]2020-11-092-14/+34
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 6465: Support multiple file edits in AssistBuilder r=matklad a=Veykril Fixes #6459 Co-authored-by: Lukas Wirth <[email protected]>
| * | | Support multiple workspace editsLukas Wirth2020-11-041-5/+18
| | | |
| * | | 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
| | |_|/ | |/| |
* | | | Merge #6500bors[bot]2020-11-091-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6500: Add some postfix snippet r=matklad a=pksunkara Nothing much to explain. Just a simple addition. I was recently doing some refactoring and this would have made it a bit more faster. Co-authored-by: Pavan Kumar Sunkara <[email protected]>
| * | | | Add some postfix snippetPavan Kumar Sunkara2020-11-081-0/+12
|/ / / /
* | | | Merge #6497bors[bot]2020-11-081-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6497: vscode: fix tmGrammar issues around non-controlflow keywords r=dustypomerleau a=cynecx Addresses some of the issues mentioned here: https://github.com/dustypomerleau/rust-syntax/issues/5. In sync with https://github.com/dustypomerleau/rust-syntax/issues/6. Co-authored-by: cynecx <[email protected]>
| * | | | vscode: fix tmGrammar issues around non-controlflow keywordscynecx2020-11-071-7/+7
| | | | |
* | | | | Merge #6476bors[bot]2020-11-075-110/+240
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-055-110/+240
| | | | |
* | | | | Merge #6491bors[bot]2020-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6491: Textmate grammar: allow variables to terminate ranges r=dustypomerleau a=dustypomerleau Variables were originally designed not to match after a dot, in order to avoid matching struct field access, however this resulted in variables that end ranges not being highlighted. In order to fix this we match a preceding dot, only if it's preceded by at least one other dot. Attempting to match on `(\.{2,})?` won't work, because the optional group allows struct field access to match even when one dot is present. Co-authored-by: Dusty Pomerleau <[email protected]>
| * | | | | allow variables to terminate rangesDusty Pomerleau2020-11-071-1/+1
|/ / / / /
* | | | | Merge #6490bors[bot]2020-11-071-368/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6490: Minimize convert_integer_literal tests r=matklad a=m-ysk Closes #6455 This PR removes some redundant tests around convert_integer_literal. First, it removes test cases about converting integer with underscores except for just one case. This is because the process of removing of underscores in given integer literals is independent from radix. Second, as well as underscore cases, it removes test cases about converting integer with suffix except for just one case. This is because the process of handling suffix is independent from radix. Finally, it removes small decimal integer cases. This is because "special case where they return early" has been removed by the PR #6482, so we have no need to retain this cases. Co-authored-by: m-ysk <[email protected]>
| * | | | | Minimize convert_integer_literal testsm-ysk2020-11-071-368/+2
|/ / / / /
* | | | | Merge #6489bors[bot]2020-11-071-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6489: Textmate grammar: Precedence fixes r=dustypomerleau a=dustypomerleau - prevent `pat` from matching before `path` in metavariable types - reduce the precedence of math operators so that assignment operators match correctly Co-authored-by: Dusty Pomerleau <[email protected]>
| * | | | | precedence fixes:Dusty Pomerleau2020-11-071-7/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | - prevent `pat` from matching before `path` in metavariable types - reduce the precedence of math operators so that assignment operators match correctly
* | | | | Merge #6488bors[bot]2020-11-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6488: Textmate grammar: add `+=` to assignment operators r=dustypomerleau a=dustypomerleau Fixes https://github.com/dustypomerleau/rust-syntax/issues/3. Co-authored-by: Dusty Pomerleau <[email protected]>
| * | | | add `+=` to assignment operatorsDusty Pomerleau2020-11-061-1/+1
| | | | |
* | | | | Merge #6486bors[bot]2020-11-065-96/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6486: Cleanup API r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | | | Cleanup APIAleksey Kladov2020-11-065-96/+84
|/ / / / /
* | | | | Merge #6485bors[bot]2020-11-0654-200/+157
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0653-164/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:35:58 +0000