aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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]>
| * | | Update lsp-typeskjeremy2020-02-263-4/+4
|/ / /
* | | Merge #3332bors[bot]2020-02-262-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3332: Fix r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | FixAleksey Kladov2020-02-261-1/+1
| | | |
| * | | wipAleksey Kladov2020-02-261-0/+14
|/ / /
* | | Merge pull request #3330 from Veetaha/feature/cargo-auditAleksey Kladov2020-02-261-0/+10
|\ \ \ | | | | | | | | cicd: add cargo audit
| * | | cicd: add cargo auditVeetaha2020-02-261-0/+10
| | |/ | |/|
* | | Merge pull request #3329 from Veetaha/feature/vscode-add-npm-auditAleksey Kladov2020-02-261-1/+6
|\ \ \ | | | | | | | | vscode: added audit at ci
| * | | vscode: added audit at ciVeetaha2020-02-261-1/+6
| | | |
* | | | Merge #3331bors[bot]2020-02-261-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 3331: Update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | | Updatekjeremy2020-02-261-6/+6
|/ / /
* | | Merge pull request #3327 from matklad/bitsetoopsAleksey Kladov2020-02-261-2/+3
|\ \ \ | | | | | | | | Fix bitset ops
| * | | Fix bitset opsAleksey Kladov2020-02-261-2/+3
| | | |
* | | | Merge pull request #3325 from edwin0cheng/skip-trival-tokenAleksey Kladov2020-02-264-23/+54
|\ \ \ \ | |/ / / |/| | | Skip trival token in original_range
| * | | Skip trival token in original_rangeEdwin Cheng2020-02-264-23/+54
| | | |
* | | | Merge pull request #3324 from matklad/highlight-tagAleksey Kladov2020-02-266-93/+111
|\ \ \ \ | | | | | | | | | | More type safety for highlighting
| * | | | More type safety for highlightingAleksey Kladov2020-02-266-93/+111
|/ / / /
* | | | Merge pull request #3322 from matklad/semantic-tokens-configAleksey Kladov2020-02-264-3/+15
|\ \ \ \ | | | | | | | | | | Config to switch to semantic tokens
| * | | | Config to switch to semantic tokensAleksey Kladov2020-02-264-3/+15
|/ / / /
* | | | Merge pull request #3321 from kjeremy/semantic-clientAleksey Kladov2020-02-262-0/+4
|\ \ \ \ | |/ / / |/| | | Enable SemanticTokens on the client
| * | | Enable SemanticTokens on the clientJeremy Kolb2020-02-262-0/+4
| | | | | | | | | | | | | | | | This will crash the extension on stable and insiders without the "--enable-proposed-api matklad.rust-analyzer" command line switch.
* | | | Merge pull request #3314 from edwin0cheng/original-range-recursiveAleksey Kladov2020-02-262-14/+57
|\ \ \ \ | | | | | | | | | | Add recursive macro support in `original_range`
| * | | | Remove duplicate commentEdwin Cheng2020-02-261-1/+0
| | | | |
| * | | | Add recursive support in original_rangeEdwin Cheng2020-02-262-14/+58
| |/ / /