From 3e1349d29fa00db1fab3a811b60bc9d8de0355e4 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 30 Sep 2016 10:45:14 -0700 Subject: 3431 Improvements to syntax highlighting, particularly for Mu code in C++ files. --- mu.vim | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'mu.vim') diff --git a/mu.vim b/mu.vim index f74b1c72..9d0ce033 100644 --- a/mu.vim +++ b/mu.vim @@ -41,17 +41,15 @@ syntax region muScreen start=+ \.+ end=+\.$\|$+ highlight link muScreen muString " mu literals -syntax match muNumber %[^ ]\+:literal/\?[^ ,]*% -syntax match muNumber %\<[0-9-]\?[0-9]\+\>% -syntax match muNumber %\<[0-9-]\?[0-9]\+/[^ ,]*% -highlight link muNumber Constant -syntax match muLabel "^\s\+[^ 0-9a-zA-Z{}#\[\]][^ ]*\s*$" -syntax match muLabel %[^ ]\+:label/\?[^ ,]*% -syntax match muLabel "<[^ ]*>" -highlight link muLabel Constant -syntax match muLiteral %[^ ]\+:type/\?[^ ,]*% -syntax match muLiteral %[^ ]\+:offset/\?[^ ,]*% -syntax match muLiteral %[^ ]\+:variant/\?[^ ,]*% +syntax match muLiteral %[^ ]\+:literal/[^ ,]*\|[^ ]\+:literal\>% +syntax match muLiteral %\<[0-9-]\?[0-9]\+\>% +syntax match muLiteral %\<[0-9-]\?[0-9]\+/[^ ,]*% +syntax match muLiteral "^\s\+[^ 0-9a-zA-Z{}#\[\]][^ ]*\s*$" +syntax match muLiteral %[^ ]\+:label/[^ ,]*\|[^ ]\+:label\>% +syntax match muLiteral "<[^ ]*>" +syntax match muLiteral %[^ ]\+:type/[^ ,]*\|[^ ]\+:type\>% +syntax match muLiteral %[^ ]\+:offset/[^ ,]*\|[^ ]\+:offset\>% +syntax match muLiteral %[^ ]\+:variant/[^ ,]*\|[^ ]\+:variant\>% highlight link muLiteral Constant syntax keyword muKeyword default-space global-space new-default-space local-scope next-ingredient ingredient rewind-ingredients load-ingredients | highlight link muKeyword Constant @@ -60,10 +58,9 @@ syntax match muAssign " <- \|\" | highlight link muAssign SpecialChar syntax match muGlobal %[^ ]\+:global/\?[^ ,]*% | highlight link muGlobal SpecialChar syntax keyword muControl reply reply-if reply-unless return return-if return-unless jump jump-if jump-unless loop loop-if loop-unless break break-if break-unless current-continuation continue-from create-delimited-continuation reply-delimited-continuation | highlight muControl ctermfg=3 " common keywords -syntax keyword muRecipe recipe recipe! def def! before after | highlight muRecipe ctermfg=208 -syntax match muRecipe " -> " -syntax keyword muScenario scenario | highlight muScenario ctermfg=34 -syntax keyword muPendingScenario pending-scenario | highlight link muPendingScenario SpecialChar -syntax keyword muData container exclusive-container type | highlight muData ctermfg=226 +syntax match muRecipe "^recipe\>\|^recipe!\>\|^def\>\|^def!\>\|^before\>\|^after\>\| -> " | highlight muRecipe ctermfg=208 +syntax match muScenario "^scenario\>" | highlight muScenario ctermfg=34 +syntax match muPendingScenario "^pending-scenario\>" | highlight link muPendingScenario SpecialChar +syntax match muData "^type\>\|^container\>\|^exclusive-container\>" | highlight muData ctermfg=226 let &cpo = s:save_cpo -- cgit 1.4.1-2-gfad0 s='blob'> 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70