aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4474 from georgewfraser/color_attrsAleksey Kladov2020-05-243-3/+9
|\ | | | | Color attribute functions
| * Color attribute functionsGeorge Fraser2020-05-193-3/+9
| |
* | Merge #4559bors[bot]2020-05-232-7/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4559: Module name on hover shows another newline after it r=matklad a=Arthamys This changes the display of hover information to add a newline between the module path of the item and the signature of the item, as suggested in #3813 **Before** ![before_3813](https://user-images.githubusercontent.com/11710698/82609224-5d517d80-9bbc-11ea-9a08-0a1558409c6b.png) **After** ![after_3813](https://user-images.githubusercontent.com/11710698/82609208-562a6f80-9bbc-11ea-8cb6-4430269c5800.png) Co-authored-by: Galilée 'Bill' Enguehard <[email protected]>
| * | Update tests to accept new hover formattingGalilée 'Bill' Enguehard2020-05-221-4/+13
| | |
| * | Fix formatting error when no modpath is presentGalilée 'Bill' Enguehard2020-05-221-3/+3
| | |
| * | Modify hover info to show module path separated by a lineGalilée 'Bill' Enguehard2020-05-221-3/+3
| | |
| * | Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into ↵Galilée 'Bill' Enguehard2020-05-2137-546/+1614
| |\ \ | | | | | | | | | | | | modname_spacing
| * | | Add extra newline after module path in hover infoGalilée 'Bill' Enguehard2020-05-211-1/+1
| | | | | | | | | | | | | | | | Closes issue #3813
* | | | KISS SourceChangeAleksey Kladov2020-05-225-86/+84
| |/ / |/| | | | | | | | | | | | | | The idea behind requiring the label is a noble one, but we are not really using it consistently anyway, and it should be easy to retrofit later, should we need it.
* | | Formalize JoinLines protocol extensionAleksey Kladov2020-05-211-6/+3
| | |
* | | CleanupAleksey Kladov2020-05-213-34/+18
| | |
* | | Cleanup TextEditAleksey Kladov2020-05-213-6/+6
| | |
* | | Remove dead code for handling cursor positionsAleksey Kladov2020-05-213-6/+0
| | |
* | | Transition OnEnter to WorkspaceSnippetEditAleksey Kladov2020-05-211-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | This also changes our handiling of snippet edits on the client side. `editor.insertSnippet` unfortunately forces indentation, which we really don't want to have to deal with. So, let's just implement our manual hacky way of dealing with a simple subset of snippets we actually use in rust-analyzer
* | | Remove unused cursor positionsAleksey Kladov2020-05-211-3/+0
| | |
* | | Remove unused cursor positionsAleksey Kladov2020-05-201-13/+7
| | |
* | | Switch to new magic marksAleksey Kladov2020-05-208-52/+34
| | |
* | | Remove cross-crate marksAleksey Kladov2020-05-202-12/+1
| | | | | | | | | | | | | | | They create quite a bit of friction. Really, we should just move the tests to the same crate, rather than paper over existing split.
* | | Add AssistConfigAleksey Kladov2020-05-195-7/+12
| | |
* | | Fix doctests in an Impl blockCoenen Benjamin2020-05-171-1/+1
| | |
* | | fix doctest inside impl block #4449Benjamin Coenen2020-05-171-2/+2
| | | | | | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
* | | fix doctest inside impl block #4449Benjamin Coenen2020-05-161-5/+65
| |/ |/| | | | | Signed-off-by: Benjamin Coenen <[email protected]>
* | Merge #4472bors[bot]2020-05-162-1/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | 4472: Fix path resolution for module and function with same name r=hasali19 a=hasali19 This fixes #3970 and also fixes completion for the same issue. Co-authored-by: Hasan Ali <[email protected]>
| * | Fix completion and hover for module and function of same nameHasan Ali2020-05-162-1/+46
| | |
* | | Add 'self to parameter' renaming.zbsz2020-05-161-5/+206
|/ /
* | Prioritize locals with correct typesAleksey Kladov2020-05-142-5/+55
| |
* | Make some stuff public so that they can be reused by other toolsPavan Kumar Sunkara2020-05-141-6/+2
| |
* | add more specific match postfix for Result and OptionBenjamin Coenen2020-05-121-15/+43
| | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
* | Merge #4423bors[bot]2020-05-111-0/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | 4423: add tests module snippet r=bnjjj a=bnjjj Request from a friend coming from intellij Rust Co-authored-by: Benjamin Coenen <[email protected]>
| * | add tests module snippetBenjamin Coenen2020-05-111-0/+8
| | | | | | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
| * | add tests module snippetBenjamin Coenen2020-05-111-0/+18
| | | | | | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
* | | Merge #4358bors[bot]2020-05-111-1/+205
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4358: add if let and while let postfix for Option and Result #4348 r=matklad a=bnjjj close #4348 I also added `while let` for iterator or stream it could be useful ![iflet](https://user-images.githubusercontent.com/5719034/81278000-676c6b80-9055-11ea-87ad-6b8476dd983f.gif) Co-authored-by: Benjamin Coenen <[email protected]>
| * | | add if let and while let postfix for Option and ResultBenjamin Coenen2020-05-101-38/+44
| | | | | | | | | | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
| * | | Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into feat_4348Benjamin Coenen2020-05-103-10/+83
| |\ \ \
| * | | | add if let and while let postfix for Option and Result #4348Benjamin Coenen2020-05-071-1/+199
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Benjamin Coenen <[email protected]>
* | | | | Merge #4397bors[bot]2020-05-113-2/+38
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4397: Textmate cooperation r=matklad a=georgewfraser This PR tweaks the fallback TextMate scopes to make them more consistent with the existing grammar and other languages, and edits the builtin TextMate grammar to align with semantic coloring. Before is on the left, after is on the right: <img width="855" alt="Screen Shot 2020-05-10 at 1 45 51 PM" src="https://user-images.githubusercontent.com/1369240/81512320-a8be7e80-92d4-11ea-8940-2c03f6769015.png"> **Use keyword.other for regular keywords instead of keyword**. This is a really peculiar quirk of TextMate conventions, but virtually *all* TextMate grammars use `keyword.other` (colored blue in VSCode Dark+) for regular keywords and `keyword.control` (colored purple in VSCode Dark+) for control keywords. The TextMate scope `keyword` is colored like control keywords, not regular keywords. It may seem strange that the `keyword` scope is not the right fallback for the `keyword` semantic token, but TextMate has a long and weird history. Note how keywords change from purple back to blue (what they were before semantic coloring was added): **(1) Use punctuation.section.embedded for format specifiers**. This aligns with how Typescript colors formatting directives: <img width="238" alt="Screen Shot 2020-05-09 at 10 54 01 AM" src="https://user-images.githubusercontent.com/1369240/81481258-93b5f280-91e3-11ea-99c2-c6d258c5bcad.png"> **(2) Consistently use `entity.name.type.*` scopes for type names**. Avoid using `entity.name.*` which gets colored like a keyword. **(3) Use Property instead of Member for fields**. Property and Member are very similar, but if you look at the TextMate fallback scopes, it's clear that Member is intended for function-like-things (methods?) and Property is intended for variable-like-things. **(4) Color `for` as a regular keyword when it's part of `impl Trait for Struct`**. **(5) Use `variable.other.constant` for constants instead of `entity.name.constant`**. In the latest VSCode insiders, variable.other.constant has a subtly different color that differentiates constants from ordinary variables. It looks close to the green of types but it's not the same---it's a new color recently added to take advantage of semantic coloring. I also made some minor changes that make the TextMate scopes better match the semantic scopes. The effect of this for the user is you observe less of a change when semantic coloring "activates". You can see the changes I made relative to the built-in TextMate grammar here: https://github.com/rust-analyzer/rust-analyzer/pull/4397/files/a91d15c80c337dd1afb0eddd5eb048010d098ac7..97428b6d52d25f810dbd7d7a8d787740c58bfbd2#diff-6966c729b862f79f79bf7258eb3e0885 Co-authored-by: George Fraser <[email protected]>
| * | | | Color `for` as a regular keyword when it's part of impl _ for _George Fraser2020-05-103-1/+28
| | | | |
| * | | | Color `in` as a control keywordGeorge Fraser2020-05-103-1/+10
| | | | |
* | | | | Merge #4421bors[bot]2020-05-111-0/+25
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4421: Find references to a function outside module r=flodiebold a=montekki Fixes #4188 Yet again, it looks like although the code in https://github.com/rust-analyzer/rust-analyzer/blob/da1f316b0246ce41d7cb8560181e294089f06ef3/crates/ra_ide_db/src/search.rs#L128-L132 may be wrong, it is not hit since the `vis` is `None` at this point. The fix is similar to the #4237 case: just add another special case to `Definition::visibility()`. Co-authored-by: Fedor Sakharov <[email protected]>
| * | | | Find references to a function outside moduleFedor Sakharov2020-05-111-0/+25
| | |/ / | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge #4394 #4414bors[bot]2020-05-104-6/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4394: Simplify r=matklad a=Veetaha 4414: Highlighting improvements r=matklad a=matthewjasper - `static mut`s are highlighted as `mutable`. - The name of the macro declared by `macro_rules!` is now highlighted. Co-authored-by: veetaha <[email protected]> Co-authored-by: Matthew Jasper <[email protected]>
| | * | | | Highlight the name in macro declarationsMatthew Jasper2020-05-103-3/+18
| | | | | |
| | * | | | Highlight mutable statics as mutableMatthew Jasper2020-05-103-3/+17
| | |/ / /
* | / / / Simplify proto conversionAleksey Kladov2020-05-101-2/+7
| |/ / / |/| | | | | | | | | | | | | | | Trait based infra in conv.rs is significantly more complicated than what we actually need here.
* | | | Remove dbgEdwin Cheng2020-05-101-1/+0
| | | |
* | | | Hot fix panic for function_signatureEdwin Cheng2020-05-101-7/+13
|/ / /
* | | Merge #4346bors[bot]2020-05-071-0/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4346: Fix rename of enum variant visible from module r=matklad a=montekki Probably fixes #4237 It looks like the ref is found correctly in this case but it's visibility is not correctly determined. I took a stab at fixing that by adding an implementation of `HasVisibility` for `EnumVariant` so it works more or less the same way it does for struct fields. In other words, the `search_range` here does not contain the ref since it's not considered visible: https://github.com/rust-analyzer/rust-analyzer/blob/efd8e34c396f1524623a495e47111f1047cf2879/crates/ra_ide_db/src/search.rs#L209-L214 Before that I tried to populate `ItemScope` with visible enum variants but that ended up with breaking tests all over the place and also it looked illogical in the end: `ItemScope` is not populated with, say, public struct fields and the same should be true for `enum` variants. I've added two more or less identical tests: one for the case with a struct field rename and one for enum variant rename; the test for struct should probably be removed and the names should be changed. Co-authored-by: Fedor Sakharov <[email protected]>
| * | | Fix rename of enum variant visible from moduleFedor Sakharov2020-05-061-0/+62
| | | |
* | | | Nicer APIAleksey Kladov2020-05-071-1/+1
| | | |
* | | | Rename AssitLabel -> AssistAleksey Kladov2020-05-071-3/+3
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:08:54 +0000