diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 16:17:19 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 16:17:19 +0000 |
commit | 7a268b9b9635425176f93d3c893fb5345e84e9ce (patch) | |
tree | 6ea69024cb22d3fc48a3b392a0185163fa452014 /editors/code/src/highlighting.ts | |
parent | 9d6740a9c9ad2ca47c4885bd994f849e90bbef86 (diff) | |
parent | b911ee542b2f4d1cd62a655f24197856cd9b9097 (diff) |
Merge #350
350: Super simple macro support r=matklad a=matklad
Super simple support for macros, mostly for figuring out how to fit them into the current architecture. Expansion is hard-coded and string based (mid-term, we should try to copy-paste macro-by-example expander from rustc).
Ideally, we should handle
* highlighting inside the macro (done)
* extend selection inside the macro
* completion inside the macro
* indexing structs, produced by the macro
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src/highlighting.ts')
-rw-r--r-- | editors/code/src/highlighting.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts index d440e77c7..2521dff62 100644 --- a/editors/code/src/highlighting.ts +++ b/editors/code/src/highlighting.ts | |||
@@ -28,7 +28,8 @@ export class Highlighter { | |||
28 | ['builtin', decor('#DD6718')], | 28 | ['builtin', decor('#DD6718')], |
29 | ['text', decor('#DCDCCC')], | 29 | ['text', decor('#DCDCCC')], |
30 | ['attribute', decor('#BFEBBF')], | 30 | ['attribute', decor('#BFEBBF')], |
31 | ['literal', decor('#DFAF8F')] | 31 | ['literal', decor('#DFAF8F')], |
32 | ['macro', decor('#DFAF8F')] | ||
32 | ]; | 33 | ]; |
33 | 34 | ||
34 | return new Map<string, vscode.TextEditorDecorationType>(decorations); | 35 | return new Map<string, vscode.TextEditorDecorationType>(decorations); |