Skip to content

Commit 75ca965

Browse files
smorimotosmorimoto
authored
Update syntaxes (#2004)
* Update `dune.json` Signed-off-by: Sora Morimoto <[email protected]> * Update `dune-project.json` Signed-off-by: Sora Morimoto <[email protected]> * Update `dune-workspace.json` Signed-off-by: Sora Morimoto <[email protected]> * Update `menhir.json` Signed-off-by: Sora Morimoto <[email protected]> * Update `ocamlformat.json` Signed-off-by: Sora Morimoto <[email protected]> * Update CHANGELOG.md Signed-off-by: Sora Morimoto <[email protected]> --------- Signed-off-by: Sora Morimoto <[email protected]>
1 parent 28e03ee commit 75ca965

File tree

6 files changed

+425
-8
lines changed

6 files changed

+425
-8
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Unreleased
44

5+
- Update syntaxes. (#2004)
6+
57
## 2.0.0
68

79
- Add OCaml onboarding welcome screen. (#1737)

‎syntaxes/dune-project.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,66 @@
342342
},
343343
"patterns": [{ "include": "source.dune#general" }]
344344
},
345+
{
346+
"comment": "maintenance_intent",
347+
"begin": "\\([[:space:]]*(maintenance_intent)\\b",
348+
"end": "\\)",
349+
"beginCaptures": {
350+
"1": { "name": "keyword.language.dune-project" }
351+
},
352+
"patterns": [{ "include": "source.dune#general" }]
353+
},
354+
{
355+
"comment": "pin",
356+
"begin": "\\([[:space:]]*(pin)\\b",
357+
"end": "\\)",
358+
"beginCaptures": {
359+
"1": { "name": "keyword.language.dune-project" }
360+
},
361+
"patterns": [
362+
{
363+
"comment": "url",
364+
"begin": "\\([[:space:]]*(url)\\b",
365+
"end": "\\)",
366+
"beginCaptures": {
367+
"1": { "name": "keyword.language.dune-project" }
368+
},
369+
"patterns": [{ "include": "source.dune#general" }]
370+
},
371+
{
372+
"comment": "package",
373+
"begin": "\\([[:space:]]*(package)\\b",
374+
"end": "\\)",
375+
"beginCaptures": {
376+
"1": { "name": "keyword.language.dune-project" }
377+
},
378+
"patterns": [
379+
{
380+
"comment": "name",
381+
"begin": "\\([[:space:]]*(name)\\b",
382+
"end": "\\)",
383+
"beginCaptures": {
384+
"1": { "name": "keyword.language.dune-project" }
385+
},
386+
"contentName": "variable.other.declaration.dune-project",
387+
"patterns": [{ "include": "source.dune#general" }]
388+
},
389+
{
390+
"comment": "version",
391+
"begin": "\\([[:space:]]*(version)\\b",
392+
"end": "\\)",
393+
"beginCaptures": {
394+
"1": { "name": "keyword.language.dune-project" }
395+
},
396+
"contentName": "constant.language.dune-project",
397+
"patterns": [{ "include": "source.dune#general" }]
398+
},
399+
{ "include": "source.dune#general" }
400+
]
401+
},
402+
{ "include": "source.dune#general" }
403+
]
404+
},
345405

346406
{ "include": "#opam-metadata" }
347407
]
@@ -415,6 +475,16 @@
415475
"1": { "name": "keyword.language.dune-project" }
416476
},
417477
"patterns": [{ "include": "source.dune#general" }]
478+
},
479+
480+
{
481+
"comment": "maintenance_intent",
482+
"begin": "\\([[:space:]]*(maintenance_intent)\\b",
483+
"end": "\\)",
484+
"beginCaptures": {
485+
"1": { "name": "keyword.language.dune-project" }
486+
},
487+
"patterns": [{ "include": "source.dune#general" }]
418488
}
419489
]
420490
}

‎syntaxes/dune-workspace.json‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,180 @@
3838
"patterns": [{ "include": "source.dune#general" }]
3939
},
4040

41+
{
42+
"comment": "lock_dir",
43+
"begin": "\\([[:space:]]*(lock_dir)\\b",
44+
"end": "\\)",
45+
"beginCaptures": {
46+
"1": { "name": "keyword.language.dune-workspace" }
47+
},
48+
"patterns": [
49+
{
50+
"comment": "path",
51+
"begin": "\\([[:space:]]*(path)\\b",
52+
"end": "\\)",
53+
"beginCaptures": {
54+
"1": { "name": "keyword.language.dune-workspace" }
55+
},
56+
"patterns": [{ "include": "source.dune#general" }]
57+
},
58+
{
59+
"comment": "repositories",
60+
"begin": "\\([[:space:]]*(repositories)\\b",
61+
"end": "\\)",
62+
"beginCaptures": {
63+
"1": { "name": "keyword.language.dune-workspace" }
64+
},
65+
"patterns": [{ "include": "source.dune#general" }]
66+
},
67+
{
68+
"comment": "solver_env",
69+
"begin": "\\([[:space:]]*(solver_env)\\b",
70+
"end": "\\)",
71+
"beginCaptures": {
72+
"1": { "name": "keyword.language.dune-workspace" }
73+
},
74+
"patterns": [{ "include": "source.dune#general" }]
75+
},
76+
{
77+
"comment": "unset_variables",
78+
"begin": "\\([[:space:]]*(unset_variables)\\b",
79+
"end": "\\)",
80+
"beginCaptures": {
81+
"1": { "name": "keyword.language.dune-workspace" }
82+
},
83+
"patterns": [{ "include": "source.dune#general" }]
84+
},
85+
{
86+
"comment": "pins",
87+
"begin": "\\([[:space:]]*(pins)\\b",
88+
"end": "\\)",
89+
"beginCaptures": {
90+
"1": { "name": "keyword.language.dune-workspace" }
91+
},
92+
"patterns": [{ "include": "source.dune#general" }]
93+
},
94+
{
95+
"comment": "version_preference",
96+
"begin": "\\([[:space:]]*(version_preference)\\b",
97+
"end": "\\)",
98+
"beginCaptures": {
99+
"1": { "name": "keyword.language.dune-workspace" }
100+
},
101+
"patterns": [
102+
{
103+
"comment": "newest/oldest",
104+
"name": "variable.other.declaration.dune-project",
105+
"match": "\\b(newest|oldest)\\b"
106+
},
107+
{ "include": "source.dune#general" }
108+
]
109+
},
110+
{
111+
"comment": "constraints",
112+
"begin": "\\([[:space:]]*(constraints)\\b",
113+
"end": "\\)",
114+
"beginCaptures": {
115+
"1": { "name": "keyword.language.dune-workspace" }
116+
},
117+
"patterns": [{ "include": "source.dune#general" }]
118+
},
119+
{
120+
"comment": "depopts",
121+
"begin": "\\([[:space:]]*(depopts)\\b",
122+
"end": "\\)",
123+
"beginCaptures": {
124+
"1": { "name": "keyword.language.dune-workspace" }
125+
},
126+
"patterns": [{ "include": "source.dune#general" }]
127+
},
128+
{ "include": "source.dune#general" }
129+
]
130+
},
131+
132+
{
133+
"comment": "pin",
134+
"begin": "\\([[:space:]]*(pin)\\b",
135+
"end": "\\)",
136+
"beginCaptures": {
137+
"1": { "name": "keyword.language.dune-workspace" }
138+
},
139+
"patterns": [
140+
{
141+
"comment": "url",
142+
"begin": "\\([[:space:]]*(url)\\b",
143+
"end": "\\)",
144+
"beginCaptures": {
145+
"1": { "name": "keyword.language.dune-workspace" }
146+
},
147+
"patterns": [{ "include": "source.dune#general" }]
148+
},
149+
{
150+
"comment": "package",
151+
"begin": "\\([[:space:]]*(package)\\b",
152+
"end": "\\)",
153+
"beginCaptures": {
154+
"1": { "name": "keyword.language.dune-workspace" }
155+
},
156+
"patterns": [
157+
{
158+
"comment": "name",
159+
"begin": "\\([[:space:]]*(name)\\b",
160+
"end": "\\)",
161+
"beginCaptures": {
162+
"1": { "name": "keyword.language.dune-workspace" }
163+
},
164+
"contentName": "variable.other.declaration.dune-project",
165+
"patterns": [{ "include": "source.dune#general" }]
166+
},
167+
{
168+
"comment": "version",
169+
"begin": "\\([[:space:]]*(version)\\b",
170+
"end": "\\)",
171+
"beginCaptures": {
172+
"1": { "name": "keyword.language.dune-workspace" }
173+
},
174+
"contentName": "constant.language.dune-project",
175+
"patterns": [{ "include": "source.dune#general" }]
176+
},
177+
{ "include": "source.dune#general" }
178+
]
179+
},
180+
{ "include": "source.dune#general" }
181+
]
182+
},
183+
184+
{
185+
"comment": "repository",
186+
"begin": "\\([[:space:]]*(repository)\\b",
187+
"end": "\\)",
188+
"beginCaptures": {
189+
"1": { "name": "keyword.language.dune-workspace" }
190+
},
191+
"patterns": [
192+
{
193+
"comment": "name",
194+
"begin": "\\([[:space:]]*(name)\\b",
195+
"end": "\\)",
196+
"beginCaptures": {
197+
"1": { "name": "keyword.language.dune-workspace" }
198+
},
199+
"contentName": "variable.other.declaration.dune-project",
200+
"patterns": [{ "include": "source.dune#general" }]
201+
},
202+
{
203+
"comment": "url",
204+
"begin": "\\([[:space:]]*(url)\\b",
205+
"end": "\\)",
206+
"beginCaptures": {
207+
"1": { "name": "keyword.language.dune-workspace" }
208+
},
209+
"patterns": [{ "include": "source.dune#general" }]
210+
},
211+
{ "include": "source.dune#general" }
212+
]
213+
},
214+
41215
{
42216
"comment": "context",
43217
"begin": "\\([[:space:]]*(context)\\b",
@@ -307,6 +481,36 @@
307481
},
308482
{ "include": "source.dune#general" }
309483
]
484+
},
485+
{
486+
"comment": "config:project_defaults",
487+
"begin": "\\([[:space:]]*(project_defaults)\\b",
488+
"end": "\\)",
489+
"beginCaptures": {
490+
"1": { "name": "keyword.language.dune-workspace" }
491+
},
492+
"patterns": [
493+
{
494+
"comment": "authors/maintainers",
495+
"begin": "\\([[:space:]]*(authors|maintainers)\\b",
496+
"end": "\\)",
497+
"beginCaptures": {
498+
"1": { "name": "keyword.language.dune-workspace" }
499+
},
500+
"patterns": [{ "include": "source.dune#general" }]
501+
},
502+
{
503+
"comment": "license",
504+
"begin": "\\([[:space:]]*(license)\\b",
505+
"end": "\\)",
506+
"beginCaptures": {
507+
"1": { "name": "keyword.language.dune-workspace" }
508+
},
509+
"contentName": "constant.language.dune-project",
510+
"patterns": [{ "include": "source.dune#general" }]
511+
},
512+
{ "include": "source.dune#general" }
513+
]
310514
}
311515
]
312516
}

0 commit comments

Comments
 (0)