aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | 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
| | | |
* | | | Merge #6484bors[bot]2020-11-061-50/+64
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 6484: Minor, cleanup style r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | 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
| |/ /
* | | Merge #6483bors[bot]2020-11-061-0/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6483: don\t indent tests r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | don\t indent testsAleksey Kladov2020-11-061-0/+26
|/ / /
* | | Merge #6482bors[bot]2020-11-066-103/+154
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6482: More orthogonal API r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | 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-062-1/+47
|/ / /
* | | Merge #6479bors[bot]2020-11-061-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 6479: Ignore RUST_SRC_PATH if it is set to invalid value r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | 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 #6470bors[bot]2020-11-051-0/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6470: Restore semantic token flickering workaround removed in #5697 r=kjeremy a=charlespierce Closes #6452 Info ----- * As discussed in #6452, the `Error('busy')` workaround for semantic token flickering was removed because the underlying issue was believed to be fixed in VS Code. * It turns out that the fix isn't yet complete, so this caused flickering of the semantic highlighting when making rapid edits (e.g. typing quickly). * This PR restores that workaround and makes it slightly more robust, covering all areas of semantic token middleware. Changes ----- * Added middleware functions for `provideDocumentSemanticTokens`, `provideDocumentSemanticTokensEdits`, and `provideDocumentRangeSemanticTokens` to match the 3 possible middleware hooks defined in https://github.com/microsoft/vscode-languageserver-node/blob/master/client/src/common/semanticTokens.ts#L33 * Each intercepts a `null` or `undefined` return and throws an error with the message `busy` instead, which prevents the tokens from being removed and re-added (causing the flickering behavior) Tested ----- * Tested locally that the flickering behavior is gone. * There don't appear to be any significant tests of the VS Code plugin side of things, other than that it loads. Is there somewhere I can / should add tests to cover this behavior? Co-authored-by: Charles Pierce <[email protected]>
| * | Restore semantic token flickering workaround removed in #5697Charles Pierce2020-11-041-0/+17
| | |
* | | Merge #6471bors[bot]2020-11-051-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6471: cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | | cargo updatekjeremy2020-11-051-6/+6
|/ / /
* | | Merge #6468bors[bot]2020-11-041-1/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 6468: Add common issues to the bug report template r=flodiebold a=lnicola Closes #6298 Co-authored-by: Laurențiu Nicola <[email protected]>
| * | Add common issues to the bug report templateLaurențiu Nicola2020-11-041-1/+10
|/ /
* | 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
| |/ /
* | | Create issue templatesAleksey Kladov2020-11-042-0/+25
| | |
* | | 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]>
| * | Fix overflow panic in convert_interger_literal assistAleksey Kladov2020-11-033-136/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | This also seizes the opportunity to move integer literal parsing to the syntax crate, were it logically belongs. Note though that this is still done in an ad hoc manner -- we probably should split kitchen sink ast::Literal into a separate APIs for strings, ints, etc
* | | Merge #6287bors[bot]2020-11-035-107/+129
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6287: Don't replace entire module and file nodes when inserting imports r=matklad a=Veykril This change minifies the resulting diff of import insertions by inserting or replacing the produced use tree directly through an `action` return value instead replacing the entire container node. This action has to be applied by the caller now. This unfortunately pulls the `AssistBuilder` into scope of `insert_use` back again but I tried to at least keep it away from the `insert_use` fn itself. I'm open to more/better ideas regarding this :) Fixes #6196 Co-authored-by: Lukas Wirth <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 17:30:09 +0000