aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #6529bors[bot]2020-11-121-19/+77
|\ | | | | | | | | | | | | | | 6529: Do not insert imports before inner comments r=Veykril a=SomeoneToIgnore Co-authored-by: Kirill Bulatov <[email protected]>
| * Remove the fixmeKirill Bulatov2020-11-121-36/+15
| |
| * Add a FIXME for non-unified inner attributesKirill Bulatov2020-11-121-2/+7
| |
| * Do not insert imports before inner commentsKirill Bulatov2020-11-121-18/+92
|/
* Merge #6534bors[bot]2020-11-124-47/+56
|\ | | | | | | | | | | | | | | | | 6534: Fix attachment of inner doc comments r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Fix attachment of inner doc commentsAleksey Kladov2020-11-123-19/+33
| |
| * Simplify codeAleksey Kladov2020-11-121-28/+23
| |
* | Merge #6531bors[bot]2020-11-1212-33/+191
|\| | | | | | | | | | | | | | | | | 6531: Update crates r=matklad a=kjeremy Co-authored-by: kjeremy <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
| * Update testsAleksey Kladov2020-11-1210-21/+168
| |
| * Update crateskjeremy2020-11-112-12/+23
|/
* Merge #6530bors[bot]2020-11-111-2/+2
|\ | | | | | | | | | | | | | | 6530: Do not use yanked once_cell r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * Do not use yanked once_cellkjeremy2020-11-111-2/+2
|/
* Merge #6526bors[bot]2020-11-114-34/+9
|\ | | | | | | | | | | | | | | | | 6526: Replace RacyFlag with OnceCell r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Replace RacyFlag with OnceCellAleksey Kladov2020-11-114-34/+9
|/
* Merge #6523bors[bot]2020-11-101-3/+6
|\ | | | | | | | | | | | | | | | | 6523: Be more pedantic when checking codeAction/resolve support r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Be more pedantic when checking codeAction/resolve supportAleksey Kladov2020-11-101-3/+6
| |
* | Merge #6521bors[bot]2020-11-1015-91/+86
|\| | | | | | | | | | | | | | | | | | | | | 6521: Switch to upstream protocol for resolving code action r=matklad a=matklad Note that we have to maintain custom implementation on the client side: I don't see how to marry bulitin resolve support with groups and snippets. Co-authored-by: Aleksey Kladov <[email protected]>
| * Switch to upstream protocol for resolving code actionAleksey Kladov2020-11-1015-91/+86
|/ | | | | | Note that we have to maintain custom implementation on the client side: I don't see how to marry bulitin resolve support with groups and snippets.
* 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:34:59 +0000