aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge #3354bors[bot]2020-02-271-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3354: Map builtin r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Map builtinAleksey Kladov2020-02-271-0/+6
| | | |
* | | | Merge #3353bors[bot]2020-02-271-0/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3353: Set attr scope r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Set attr scopeAleksey Kladov2020-02-271-0/+6
|/ / /
* | | Merge #3352bors[bot]2020-02-271-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3352: Map unsafe keyword r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Map unsafe keywordAleksey Kladov2020-02-271-0/+6
| | | |
* | | | Merge #3351bors[bot]2020-02-273-63/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3351: Refactor string literals r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Refactor string literalsAleksey Kladov2020-02-273-63/+80
|/ / /
* | | Merge pull request #3350 from edwin0cheng/give-up-hover-in-builtin-macroAleksey Kladov2020-02-271-0/+25
|\ \ \ | | | | | | | | Ignore hover on builtin macro
| * | | Ignore hover on builtin macroEdwin Cheng2020-02-271-0/+25
| | | |
* | | | Merge pull request #3349 from matklad/yo-dawgAleksey Kladov2020-02-275-23/+120
|\ \ \ \ | | | | | | | | | | Put syntax highlighting into syntax highlighting
| * | | | Basic injectionsAleksey Kladov2020-02-275-23/+120
| | | | |
* | | | | Merge pull request #3348 from matklad/single-lineAleksey Kladov2020-02-272-3/+52
|\| | | | | |/ / / |/| | | Ensure that semantic tokens are single-line
| * | | Ensure that semantic tokens are single-lineAleksey Kladov2020-02-272-3/+52
|/ / /
* | | Merge #3346bors[bot]2020-02-272-242/+231
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3346: More cleanup r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Move tests to a new fileAleksey Kladov2020-02-272-134/+129
| | | |
| * | | More cleanupAleksey Kladov2020-02-271-114/+108
|/ / /
* | | Merge #3344bors[bot]2020-02-271-65/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3344: Split loop into orthogonal phases r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Split loop into orthogonal phasesAleksey Kladov2020-02-271-44/+43
| | | |
| * | | CleanupAleksey Kladov2020-02-271-37/+34
| | | |
| * | | Minor cleanupAleksey Kladov2020-02-271-15/+18
|/ / /
* | | Merge #3343bors[bot]2020-02-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3343: Fix style r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix styleAleksey Kladov2020-02-271-1/+1
| | | |
* | | | Merge #3342bors[bot]2020-02-274-1/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3342: Some docs r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Some docsAleksey Kladov2020-02-274-1/+8
| | | |
* | | | Merge #3341bors[bot]2020-02-272-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3341: Make xtask install path-agnostic r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Make xtask install path-agnosticAleksey Kladov2020-02-272-1/+6
|/ / /
* | | Merge pull request #3340 from matklad/fix-lintAleksey Kladov2020-02-273-3/+4
|\ \ \ | | | | | | | | Actually gate CI on eslint
| * | | Fix lintAleksey Kladov2020-02-271-1/+1
| | | |
| * | | Actually gate CI on eslintAleksey Kladov2020-02-272-2/+3
|/ / /
* | | Merge #3339bors[bot]2020-02-271-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3339: Fix flickering with new syntax highlighting r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix flickering with new syntax highlightingAleksey Kladov2020-02-271-1/+9
| | | |
* | | | Merge #3308bors[bot]2020-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3308: vscode: fix vscode-vim keybindings conflict r=matklad a=Veetaha Closes #3013 I hope vscode-vim extension overrides the `type` command so that it prevents some keypresses to reach the text document editor. It conflicts with our `onEnter` keybinding that is used to support automatic doc comments extending and indentation insertion. The VSCode-native way to implement this would be to use regular expressions, but as per matklad it is considered not acceptable for the language server. Thus we implement it via a `Enter` keybinding that invokes our `onEnter` command which does it via the language-server. At the end of the day we may only apply ad hoc workarounds for conflicting extensions. But vscode has another bug for that. You either cannot use parantheses in `when` condition of a keybinding or it just malfunctions. See an issue about that here: https://github.com/microsoft/vscode/issues/91473 To get the ultimate context, follow this [zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Enhanced.20typing) Co-authored-by: Veetaha <[email protected]>
| * | | | vscode: fix vscode-vim keybindings conflictVeetaha2020-02-251-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vscode-vim extension overrides the `type` command so that it prevents some keypresses to reach the text document editor. It conflicts with our `onEnter` keybinding that is used to support automatic doc comments extending and indentation insertion. The VSCode-native way to implement this would be to use regular expressions, but as per matklad it is considered not acceptable for the language server. Thus we implement it via a `Enter` keybinding that invokes our `onEnter` command which sends a request to rust-analyzer process and applies the appropriate source change recieved from it. At the end of the day we may only apply ad hoc workarounds for conflicting extensions. But vscode has another bug for that. You either cannot use parantheses in `when` condition of a keybinding or it just malfunctions. See an issue about that here: https://github.com/microsoft/vscode/issues/91473 To get the ultimate context, follow this zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Enhanced.20typing
* | | | Merge #3285bors[bot]2020-02-271-26/+115
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3285: Handle trivia in Structural Search and Replace r=matklad a=adamrk Addresses the second point of https://github.com/rust-analyzer/rust-analyzer/issues/3186. Structural search and replace will now match code that has varies from the pattern in whitespace or comments. One issue is that it's not clear where comments in the matched code should go in the replacement. With this change they're just tacked on at the end, which can cause some unexpected moving of comments (see the last test example). Co-authored-by: adamrk <[email protected]>
| * | | get matches from code.descendantsadamrk2020-02-251-7/+9
| | | |
| * | | save comments as ra_syntax::ast::Commentadamrk2020-02-251-10/+6
| | | |
| * | | Handle trivia in strucural search and replaceadamrk2020-02-231-27/+118
| | | |
* | | | Merge #3338bors[bot]2020-02-272-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3338: Renam module r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | | Renam moduleAleksey Kladov2020-02-272-2/+2
|/ / / /
* | | | Merge #3335bors[bot]2020-02-2712-305/+478
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3335: Refactor highlighting a bit r=matklad a=matklad bors r+ Co-authored-by: Aleksey Kladov <[email protected]>
| * | | | Color constantsAleksey Kladov2020-02-273-2/+13
| | | | |
| * | | | Move html highlightig to a separate moduleAleksey Kladov2020-02-272-97/+107
| | | | |
| * | | | Fix html testsAleksey Kladov2020-02-273-39/+39
| | | | |
| * | | | Better highlightign APIAleksey Kladov2020-02-279-180/+332
| | | | |
* | | | | Merge #3337bors[bot]2020-02-279-44/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3337: Remove unused dependencies r=matklad a=sinkuu Co-authored-by: Shotaro Yamada <[email protected]>
| * | | | | Remove unused dependenciesShotaro Yamada2020-02-279-44/+0
|/ / / / /
* | | | | Merge #3336bors[bot]2020-02-274-19/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3336: Use text_range::extend_to r=edwin0cheng a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| * | | | Use text_range::extend_toEdwin Cheng2020-02-274-19/+6
|/ / / /
* | | | Merge #3334bors[bot]2020-02-263-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3334: Update lsp-types r=matklad a=kjeremy Uses the correct type for the currently unused `SemanticTokensEditsRequest::Return` Co-authored-by: kjeremy <[email protected]>