aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #2693bors[bot]2019-12-306-155/+139
|\ | | | | | | | | | | | | | | 2693: Encapsulate inlay hints activation r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Encapsulate inlay hints activationAleksey Kladov2019-12-302-38/+39
| |
| * Dead codeAleksey Kladov2019-12-302-18/+2
| |
| * status is not a commandAleksey Kladov2019-12-302-13/+13
| |
| * Hints are not commandsAleksey Kladov2019-12-303-4/+2
| |
| * Move all commands to ctxAleksey Kladov2019-12-303-22/+26
| |
| * Minor refactorAleksey Kladov2019-12-301-9/+7
| |
| * Refactor runablesAleksey Kladov2019-12-303-67/+66
|/
* Merge #2692bors[bot]2019-12-305-82/+60
|\ | | | | | | | | | | | | | | 2692: Move expand macro to the new context r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Move expand macro to the new contextAleksey Kladov2019-12-305-75/+53
| |
| * CleanupAleksey Kladov2019-12-302-11/+11
| |
* | Merge #2691bors[bot]2019-12-3015-280/+240
|\| | | | | | | | | | | | | | | 2691: Cleanup imports r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Cleanup importsAleksey Kladov2019-12-305-8/+12
| |
| * Refactor show syntax tree actionAleksey Kladov2019-12-308-134/+116
| |
| * Run prettier on all filesAleksey Kladov2019-12-307-23/+18
| |
| * Move parentModule to the new CtxAleksey Kladov2019-12-303-37/+37
| |
| * Refactor applySourceChangeAleksey Kladov2019-12-307-89/+68
| |
| * Move joinLines to the new CtxAleksey Kladov2019-12-303-21/+21
|/
* Merge #2690bors[bot]2019-12-301-1/+1
|\ | | | | | | | | | | | | | | 2690: Fix server config mispell in vscode extension r=matklad a=kiljacken Fixes #2689 Co-authored-by: Emil Lauridsen <[email protected]>
| * Fix server config mispell in vscode extensionEmil Lauridsen2019-12-301-1/+1
|/
* Merge #2687bors[bot]2019-12-307-52/+110
|\ | | | | | | | | | | | | | | 2687: Move matching brace to new Ctx r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * Move matching brace to new CtxAleksey Kladov2019-12-304-32/+35
| |
| * Run prettierAleksey Kladov2019-12-302-20/+16
| |
| * Add prettierAleksey Kladov2019-12-302-6/+19
| |
| * More second command to CtxAleksey Kladov2019-12-304-11/+14
| |
| * Start new ctx moduleAleksey Kladov2019-12-304-20/+63
|/
* Merge #2685bors[bot]2019-12-305-36/+33
|\ | | | | | | | | | | | | | | 2685: Simplify r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * SimplifyAleksey Kladov2019-12-301-32/+29
| |
| * Rename extension.ts -> main.tsAleksey Kladov2019-12-304-4/+4
| |
* | Merge pull request #2684 from matklad/refactor-frontendAleksey Kladov2019-12-3016-1663/+158
|\| | | | | Refactor frontend
| * Minimize typescript CIAleksey Kladov2019-12-302-9/+2
| |
| * Add rollupAleksey Kladov2019-12-306-38/+751
| |
| * Minimize TypeScript buildAleksey Kladov2019-12-3011-1864/+42
| |
| * Trim down launch configurationsAleksey Kladov2019-12-295-71/+15
| |
| * Drop all the debugging tasksAleksey Kladov2019-12-291-309/+0
| | | | | | | | | | | | | | | | There are too many of them, and they no longer match the set of crates we have. This really should be handled in a different way, by having out "rust-analyzer: Run" generate the appropriate lldb config on the fly.
| * Drop obsolete tasksAleksey Kladov2019-12-291-25/+1
|/
* Merge #2681bors[bot]2019-12-293-2/+307
|\ | | | | | | | | | | | | | | 2681: cargo-watcher: Resolve macro call site in more cases r=matklad a=kiljacken This resolves the actual macro call site in a few more cases, f.x. when a macro invokes `compile_error!` (I'm looking at you `ra_hir_def::path::__path`). Co-authored-by: Emil Lauridsen <[email protected]>
| * Add related information with original error siteEmil Lauridsen2019-12-293-1/+306
| |
| * Resolve macro call site in more casesEmil Lauridsen2019-12-291-1/+1
| |
* | Merge #2680bors[bot]2019-12-293-63/+71
|\ \ | |/ |/| | | | | | | | | | | 2680: Fix cargo-watcher file urls on windows r=matklad a=kiljacken Fixes #2676 Co-authored-by: Emil Lauridsen <[email protected]>
| * Lowercase drive letters when getting paths from cargo checkEmil Lauridsen2019-12-293-63/+71
| |
* | Merge #2679bors[bot]2019-12-295-14/+63
|\ \ | | | | | | | | | | | | | | | | | | | | | 2679: Resolve traits for infer using lang item infrastructure r=matklad a=kiljacken As we already have the infrastructure for collecting lang items, use it to find the right traits when doing type-inference. Co-authored-by: Emil Lauridsen <[email protected]>
| * | Remove unused hard-coded pathsEmil Lauridsen2019-12-291-4/+0
| | |
| * | Resolve traits in infer using lang item infrastructureEmil Lauridsen2019-12-293-10/+19
| | |
| * | Add helpers for unpacking lang itemsEmil Lauridsen2019-12-291-0/+44
| |/
* | Merge #2061bors[bot]2019-12-297-14/+369
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2061: Theme loading and "editor.tokenColorCustomizations" support. r=matklad a=seivan Fixes: [Issue#1294](https://github.com/rust-analyzer/rust-analyzer/issues/1294#issuecomment-497450325) TODO: - [x] Load themes - [x] Load existing `ralsp`-prefixed overrides from `"workbench.colorCustomizations"`. - [x] Load overrides from `"editor.tokenColorCustomizations.textMateRules"`. - [x] Use RA tags to load `vscode.DecorationRenderOptions` (colors) from theme & overrides. - [x] Map RA tags to common TextMate scopes before loading colors. - [x] Add default scope mappings in extension. - [x] Cache mappings between settings updates. - [x] Add scope mapping configuration manifest in `package.json` - [x] Load configurable scope mappings from settings. - [x] Load JSON Scheme for text mate scope rules in settings. - [x] Update [Readme](https://github.com/seivan/rust-analyzer/blob/feature/themes/docs/user/README.md#settings). Borrowed the theme loading (`scopes.ts`) from `Tree Sitter` with some modifications to reading `"editor.tokenColorCustomizations"` for merging with loaded themes and had to remove the async portions to be able to load it from settings updates. ~Just a PoC and an idea I toyed around with a lot of room for improvement.~ For starters, certain keywords aren't part of the standard TextMate grammar, so it still reads colors from the `ralsp` prefixed values in `"workbench.colorCustomizations"`. But I think there's more value making the extension work with existing themes by maping some of the decoration tags to existing key or keys. <img width="453" alt="Screenshot 2019-11-09 at 17 43 18" src="https://user-images.githubusercontent.com/55424/68531968-71b4e380-0318-11ea-924e-cdbb8d5eae06.png"> <img width="780" alt="Screenshot 2019-11-09 at 17 41 45" src="https://user-images.githubusercontent.com/55424/68531950-4b8f4380-0318-11ea-8f85-24a84efaf23b.png"> <img width="468" alt="Screenshot 2019-11-09 at 17 40 29" src="https://user-images.githubusercontent.com/55424/68531952-51852480-0318-11ea-800a-6ae9215f5368.png"> These will merge with the default ones coming with the extension, so you don't have to implement all of them and works well with overrides defined in settings. ```jsonc "editor.tokenColorCustomizations": { "textMateRules": [ { "scope": "keyword", "settings": { "fontStyle": "bold", } }, ] }, ``` Edit: The idea is to work with 90% of the themes out there by working within existing scopes available that are generally styled. It's not to say I want to erase the custom Rust scopes - those should still remain and eventually worked into a custom grammar bundle for Rust specific themes that target those, I just want to make it work with generic themes offered on the market place for now. A custom grammar bundle and themes for Rust specific scopes is out of... scope for this PR. We'll make another round to tackle those issues. Current fallbacks implemented ```typescript [ 'comment', [ 'comment', 'comment.block', 'comment.line', 'comment.block.documentation' ] ], ['string', ['string']], ['keyword', ['keyword']], ['keyword.control', ['keyword.control', 'keyword', 'keyword.other']], [ 'keyword.unsafe', ['storage.modifier', 'keyword.other', 'keyword.control', 'keyword'] ], ['function', ['entity.name.function']], ['parameter', ['variable.parameter']], ['constant', ['constant', 'variable']], ['type', ['entity.name.type']], ['builtin', ['variable.language', 'support.type', 'support.type']], ['text', ['string', 'string.quoted', 'string.regexp']], ['attribute', ['keyword']], ['literal', ['string', 'string.quoted', 'string.regexp']], ['macro', ['support.other']], ['variable', ['variable']], ['variable.mut', ['variable', 'storage.modifier']], [ 'field', [ 'variable.object.property', 'meta.field.declaration', 'meta.definition.property', 'variable.other' ] ], ['module', ['entity.name.section', 'entity.other']] ``` Co-authored-by: Seivan Heidari <[email protected]>
| * Fix ↵Seivan Heidari2019-12-234-16/+20
| | | | | | | | | | | | https://github.com/rust-analyzer/rust-analyzer/pull/2061#discussion_r348716036 Fix https://github.com/rust-analyzer/rust-analyzer/pull/2061/files/68a5ff050faf514e9d122212a66703ca8ce66ab7#r361019340
| * Merge branch 'master' into feature/themesSeivan Heidari2019-12-23233-10763/+14882
| |\
| * \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-28150-3077/+3558
| |\ \ | | | | | | | | | | | | feature/themes
| * \ \ Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-252-5/+55
| |\ \ \ | | | | | | | | | | | | | | | feature/themes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 22:22:19 +0000