Skip to content

Commit bd616bb

Browse files
spoenemannspoenemann
committed
Updated sprotty, langium and typescript dependencies
1 parent c11b093 commit bd616bb

File tree

12 files changed

+153
-107
lines changed

12 files changed

+153
-107
lines changed

‎examples/states-langium/extension/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
"states-language-server": "^0.0.0",
155155
"states-sprotty-webview": "^0.0.8",
156156
"ts-loader": "^9.2.6",
157-
"typescript": "3.8.3",
157+
"typescript": "~4.6.2",
158158
"vscode-languageclient": "^7.0.0",
159159
"webpack": "^5.64.2",
160160
"webpack-cli": "^4.9.1"

‎examples/states-langium/language-server/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
"description": "Please enter a brief description here",
55
"version": "0.0.0",
66
"dependencies": {
7-
"langium": "0.3.0",
8-
"langium-sprotty": "0.3.0",
9-
"sprotty-elk": "^0.11.0",
7+
"langium": "0.4.0",
8+
"langium-sprotty": "0.4.0",
9+
"sprotty-elk": "^0.12.0",
1010
"vscode-languageserver": "^7.0.0"
1111
},
1212
"devDependencies": {
1313
"@types/node": "^14.17.3",
1414
"@types/vscode": "^1.56.0",
15-
"langium-cli": "0.3.0",
15+
"langium-cli": "0.4.0",
1616
"ts-loader": "^9.2.6",
17-
"typescript": "3.8.3",
17+
"typescript": "~4.6.2",
1818
"webpack": "^5.64.2",
1919
"webpack-cli": "^4.9.1"
2020
},

‎examples/states-langium/language-server/src/generated/ast.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 0.3.0.
2+
* This file was generated by langium-cli 0.4.0.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

66
/* eslint-disable @typescript-eslint/array-type */
77
/* eslint-disable @typescript-eslint/no-empty-interface */
8-
import { AstNode, AstReflection, Reference, isAstNode } from 'langium';
8+
import { AstNode, AstReflection, Reference, isAstNode, TypeMetaData } from 'langium';
99

1010
export interface Event extends AstNode {
1111
readonly $container: StateMachine;
@@ -92,6 +92,34 @@ export class StatesAstReflection implements AstReflection {
9292
}
9393
}
9494
}
95+
96+
getTypeMetaData(type: string): TypeMetaData {
97+
switch (type) {
98+
case 'State': {
99+
return {
100+
name: 'State',
101+
mandatory: [
102+
{ name: 'transitions', type: 'array' }
103+
]
104+
};
105+
}
106+
case 'StateMachine': {
107+
return {
108+
name: 'StateMachine',
109+
mandatory: [
110+
{ name: 'events', type: 'array' },
111+
{ name: 'states', type: 'array' }
112+
]
113+
};
114+
}
115+
default: {
116+
return {
117+
name: type,
118+
mandatory: []
119+
};
120+
}
121+
}
122+
}
95123
}
96124

97125
export const reflection = new StatesAstReflection();

‎examples/states-langium/language-server/src/generated/grammar.ts‎

Lines changed: 69 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 0.3.0.
2+
* This file was generated by langium-cli 0.4.0.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

@@ -8,34 +8,30 @@ import { loadGrammar, Grammar } from 'langium';
88
let loadedStatesGrammar: Grammar | undefined;
99
export const StatesGrammar = (): Grammar => loadedStatesGrammar ||(loadedStatesGrammar = loadGrammar(`{
1010
"$type": "Grammar",
11-
"usedGrammars": [],
12-
"hiddenTokens": [],
13-
"imports": [],
11+
"isDeclared": true,
12+
"name": "States",
1413
"rules": [
1514
{
1615
"$type": "ParserRule",
17-
"parameters": [],
1816
"name": "StateMachine",
19-
"hiddenTokens": [],
2017
"entry": true,
2118
"alternatives": {
2219
"$type": "Group",
2320
"elements": [
2421
{
2522
"$type": "Keyword",
26-
"value": "statemachine",
27-
"elements": []
23+
"value": "statemachine"
2824
},
2925
{
3026
"$type": "Assignment",
3127
"feature": "name",
3228
"operator": "=",
3329
"terminal": {
3430
"$type": "RuleCall",
35-
"arguments": [],
3631
"rule": {
3732
"$refText": "ID"
38-
}
33+
},
34+
"arguments": []
3935
}
4036
},
4137
{
@@ -47,55 +43,55 @@ export const StatesGrammar = (): Grammar => loadedStatesGrammar ||(loadedStatesG
4743
"operator": "+=",
4844
"terminal": {
4945
"$type": "RuleCall",
50-
"arguments": [],
5146
"rule": {
5247
"$refText": "State"
53-
}
54-
},
55-
"elements": []
48+
},
49+
"arguments": []
50+
}
5651
},
5752
{
5853
"$type": "Assignment",
5954
"feature": "events",
6055
"operator": "+=",
6156
"terminal": {
6257
"$type": "RuleCall",
63-
"arguments": [],
6458
"rule": {
6559
"$refText": "Event"
66-
}
67-
},
68-
"elements": []
60+
},
61+
"arguments": []
62+
}
6963
}
7064
],
7165
"cardinality": "*"
7266
}
7367
]
74-
}
68+
},
69+
"definesHiddenTokens": false,
70+
"fragment": false,
71+
"hiddenTokens": [],
72+
"parameters": [],
73+
"wildcard": false
7574
},
7675
{
7776
"$type": "ParserRule",
78-
"parameters": [],
7977
"name": "State",
80-
"hiddenTokens": [],
8178
"alternatives": {
8279
"$type": "Group",
8380
"elements": [
8481
{
8582
"$type": "Keyword",
86-
"value": "state",
87-
"elements": []
83+
"value": "state"
8884
},
8985
{
9086
"$type": "Assignment",
9187
"feature": "name",
9288
"operator": "=",
9389
"terminal": {
9490
"$type": "RuleCall",
95-
"arguments": [],
9691
"rule": {
9792
"$refText": "ID"
98-
}
93+
},
94+
"arguments": []
9995
}
10096
},
10197
{
@@ -104,49 +100,56 @@ export const StatesGrammar = (): Grammar => loadedStatesGrammar ||(loadedStatesG
104100
"operator": "+=",
105101
"terminal": {
106102
"$type": "RuleCall",
107-
"arguments": [],
108103
"rule": {
109104
"$refText": "Transition"
110-
}
105+
},
106+
"arguments": []
111107
},
112108
"cardinality": "*"
113109
}
114110
]
115-
}
111+
},
112+
"definesHiddenTokens": false,
113+
"entry": false,
114+
"fragment": false,
115+
"hiddenTokens": [],
116+
"parameters": [],
117+
"wildcard": false
116118
},
117119
{
118120
"$type": "ParserRule",
119-
"parameters": [],
120121
"name": "Event",
121-
"hiddenTokens": [],
122122
"alternatives": {
123123
"$type": "Group",
124124
"elements": [
125125
{
126126
"$type": "Keyword",
127-
"value": "event",
128-
"elements": []
127+
"value": "event"
129128
},
130129
{
131130
"$type": "Assignment",
132131
"feature": "name",
133132
"operator": "=",
134133
"terminal": {
135134
"$type": "RuleCall",
136-
"arguments": [],
137135
"rule": {
138136
"$refText": "ID"
139-
}
137+
},
138+
"arguments": []
140139
}
141140
}
142141
]
143-
}
142+
},
143+
"definesHiddenTokens": false,
144+
"entry": false,
145+
"fragment": false,
146+
"hiddenTokens": [],
147+
"parameters": [],
148+
"wildcard": false
144149
},
145150
{
146151
"$type": "ParserRule",
147-
"parameters": [],
148152
"name": "Transition",
149-
"hiddenTokens": [],
150153
"alternatives": {
151154
"$type": "Group",
152155
"elements": [
@@ -158,9 +161,9 @@ export const StatesGrammar = (): Grammar => loadedStatesGrammar ||(loadedStatesG
158161
"$type": "CrossReference",
159162
"type": {
160163
"$refText": "Event"
161-
}
162-
},
163-
"elements": []
164+
},
165+
"deprecatedSyntax": false
166+
}
164167
},
165168
{
166169
"$type": "Keyword",
@@ -174,54 +177,64 @@ export const StatesGrammar = (): Grammar => loadedStatesGrammar ||(loadedStatesG
174177
"$type": "CrossReference",
175178
"type": {
176179
"$refText": "State"
177-
}
180+
},
181+
"deprecatedSyntax": false
178182
}
179183
}
180184
]
181-
}
185+
},
186+
"definesHiddenTokens": false,
187+
"entry": false,
188+
"fragment": false,
189+
"hiddenTokens": [],
190+
"parameters": [],
191+
"wildcard": false
182192
},
183193
{
184194
"$type": "TerminalRule",
185195
"hidden": true,
186196
"name": "WS",
187197
"terminal": {
188198
"$type": "RegexToken",
189-
"regex": "\\\\s+",
190-
"elements": []
191-
}
199+
"regex": "\\\\s+"
200+
},
201+
"fragment": false
192202
},
193203
{
194204
"$type": "TerminalRule",
195205
"name": "ID",
196206
"terminal": {
197207
"$type": "RegexToken",
198-
"regex": "[_a-zA-Z][\\\\w_]*",
199-
"elements": []
200-
}
208+
"regex": "[_a-zA-Z][\\\\w_]*"
209+
},
210+
"fragment": false,
211+
"hidden": false
201212
},
202213
{
203214
"$type": "TerminalRule",
204215
"hidden": true,
205216
"name": "ML_COMMENT",
206217
"terminal": {
207218
"$type": "RegexToken",
208-
"regex": "\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\/",
209-
"elements": []
210-
}
219+
"regex": "\\\\/\\\\*[\\\\s\\\\S]*?\\\\*\\\\/"
220+
},
221+
"fragment": false
211222
},
212223
{
213224
"$type": "TerminalRule",
214225
"hidden": true,
215226
"name": "SL_COMMENT",
216227
"terminal": {
217228
"$type": "RegexToken",
218-
"regex": "\\\\/\\\\/[^\\\\n\\\\r]*",
219-
"elements": []
220-
}
229+
"regex": "\\\\/\\\\/[^\\\\n\\\\r]*"
230+
},
231+
"fragment": false
221232
}
222233
],
234+
"definesHiddenTokens": false,
235+
"hiddenTokens": [],
236+
"imports": [],
223237
"interfaces": [],
224238
"types": [],
225-
"isDeclared": true,
226-
"name": "States"
239+
"usedGrammars": []
227240
}`));

‎examples/states-langium/language-server/src/generated/module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* This file was generated by langium-cli 0.3.0.
2+
* This file was generated by langium-cli 0.4.0.
33
* DO NOT EDIT MANUALLY!
44
******************************************************************************/
55

‎examples/states-webview/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
],
3939
"dependencies": {
4040
"reflect-metadata": "^0.1.13",
41-
"sprotty": "~0.11.1",
41+
"sprotty": "~0.12.0",
4242
"sprotty-vscode-webview": "^0.2.0"
4343
},
4444
"devDependencies": {
@@ -48,7 +48,7 @@
4848
"source-map-loader": "^3.0.0",
4949
"style-loader": "^1.2.1",
5050
"ts-loader": "^9.2.6",
51-
"typescript": "3.8.3",
51+
"typescript": "~4.6.2",
5252
"webpack": "^5.64.2",
5353
"webpack-cli": "^4.9.1"
5454
},

‎examples/states-xtext/extension/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"sprotty-vscode": "^0.2.0",
157157
"states-sprotty-webview": "^0.0.8",
158158
"ts-loader": "^9.2.6",
159-
"typescript": "3.8.3",
159+
"typescript": "~4.6.2",
160160
"vscode-languageclient": "^7.0.0",
161161
"webpack": "^5.64.2",
162162
"webpack-cli": "^4.9.1"

0 commit comments

Comments
 (0)