Skip to content

Commit

Permalink
Update dependencies, advance Langium examples to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisalmen committed Aug 18, 2023
1 parent ee337a0 commit fcfe8a3
Show file tree
Hide file tree
Showing 12 changed files with 661 additions and 632 deletions.
425 changes: 212 additions & 213 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
"private": true,
"type": "module",
"devDependencies": {
"@types/node": "~18.16.19",
"@types/vscode": "~1.80.0",
"@typescript-eslint/eslint-plugin": "~6.1.0",
"@typescript-eslint/parser": "~6.1.0",
"@types/node": "~18.17.5",
"@types/vscode": "~1.81.0",
"@typescript-eslint/eslint-plugin": "~6.4.0",
"@typescript-eslint/parser": "~6.4.0",
"editorconfig": "~2.0.0",
"eslint": "~8.45.0",
"eslint": "~8.47.0",
"eslint-config-standard": "~17.1.0",
"eslint-plugin-header": "~3.1.1",
"eslint-plugin-import": "~2.27.5",
"eslint-plugin-import": "~2.28.0",
"eslint-plugin-promise": "~6.1.1",
"eslint-plugin-unused-imports": "~3.0.0",
"path-browserify": "~1.0.1",
"shx": "~0.3.4",
"tslib": "~2.6.0",
"tslib": "~2.6.1",
"typescript": "~5.1.6",
"vite": "~4.4.6"
"vite": "~4.4.9"
},
"volta": {
"node": "18.17.0",
"node": "18.17.1",
"npm": "9.6.7"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"npm": ">=9.0.0"
},
"volta": {
"node": "18.17.0",
"node": "18.17.1",
"npm": "9.6.7"
},
"files": [
Expand Down
8 changes: 4 additions & 4 deletions packages/examples/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"dependencies": {
"express": "~4.18.2",
"langium": "~1.2.1",
"langium-statemachine-dsl": "~1.2.0",
"langium": "~2.0.0",
"langium-statemachine-dsl": "~2.0.0",
"monaco-editor-workers": "~0.41.0",
"monaco-languageclient": "~6.4.1",
"react": "~18.2.0",
Expand All @@ -38,13 +38,13 @@
"devDependencies": {
"@types/ws": "~8.5.5",
"@types/express": "~4.17.17",
"@types/react": "~18.2.15",
"@types/react": "~18.2.20",
"@types/react-dom": "~18.2.7",
"ts-node": "~10.9.1",
"vscode-languageserver-types": "~3.17.3"
},
"volta": {
"node": "18.17.0",
"node": "18.17.1",
"npm": "9.6.7"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/main/src/langium/example.langium
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ FeatureName returns string:

terminal ID: /\^?[_a-zA-Z][\w_]*/;
terminal STRING: /"(\\.|[^"\\])*"|'(\\.|[^'\\])*'/;
terminal RegexLiteral returns string: /\/(?![*+?])(?:[^\r\n\[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*\])+\//;
terminal RegexLiteral returns string: /\/(?![*+?])(?:[^\r\n\[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*\])+\/[a-z]*/;

hidden terminal WS: /\s+/;
hidden terminal ML_COMMENT: /\/\*[\s\S]*?\*\//;
Expand Down
286 changes: 158 additions & 128 deletions packages/examples/main/src/langium/langium.configuration.json
Original file line number Diff line number Diff line change
@@ -1,134 +1,164 @@
{
"comments": {
"lineComment": "//",
"blockComment": ["/*", "*/"]
"comments": {
"lineComment": "//",
"blockComment": [
"/*",
"*/"
]
},
"brackets": [
[
"{",
"}"
],
[
"[",
"]"
],
[
"(",
")"
]
],
"autoClosingPairs": [
{
"open": "{",
"close": "}"
},
{
"open": "[",
"close": "]"
},
"brackets": [
["{", "}"],
["[", "]"],
["(", ")"]
{
"open": "(",
"close": ")"
},
{
"open": "'",
"close": "'",
"notIn": [
"string",
"comment"
]
},
{
"open": "\"",
"close": "\"",
"notIn": [
"string"
]
},
{
"open": "/**",
"close": " */",
"notIn": [
"string"
]
}
],
"autoCloseBefore": "}])`\n\t",
"surroundingPairs": [
[
"{",
"}"
],
"autoClosingPairs": [
{ "open": "{", "close": "}" },
{ "open": "[", "close": "]" },
{ "open": "(", "close": ")" },
{
"open": "'",
"close": "'",
"notIn": [
"string",
"comment"
]
},
{
"open": "\"",
"close": "\"",
"notIn": [
"string"
]
},
{
"open": "/**",
"close": " */",
"notIn": [
"string"
]
}
[
"[",
"]"
],
[
"(",
")"
]
],
"colorizedBracketPairs": [
[
"(",
")"
],
"autoCloseBefore": "}])`\n\t",
"surroundingPairs": [
["{", "}"],
["[", "]"],
["(", ")"]
[
"[",
"]"
],
"colorizedBracketPairs": [
[
"(",
")"
],
[
"[",
"]"
],
[
"{",
"}"
],
[
"<",
">"
],
[
"'",
"'"
],
[
"\"",
"\""
],
[
"<",
">"
]
],
"onEnterRules": [
{
"": "// e.g. /** | */",
"beforeText": {
"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
},
"afterText": {
"pattern": "^\\s*\\*/$"
},
"action": {
"indent": "indentOutdent",
"appendText": " * "
}
},
{
"": "// e.g. /** ...|",
"beforeText": {
"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
},
"action": {
"indent": "none",
"appendText": " * "
}
},
{
"": "// e.g. * ...|",
"beforeText": {
"pattern": "^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
},
"previousLineText": {
"pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"
},
"action": {
"indent": "none",
"appendText": "* "
}
},
{
"": "// e.g. */|",
"beforeText": {
"pattern": "^(\\t|[ ])*[ ]\\*/\\s*$"
},
"action": {
"indent": "none",
"removeText": 1
}
},
{
"beforeText": ":\\s*$",
"action": {
"indent": "indent"
}
},
{
"beforeText": ";\\s*$",
"action": {
"indent": "outdent"
}
}
[
"{",
"}"
],
[
"<",
">"
],
[
"'",
"'"
],
[
"\"",
"\""
],
[
"<",
">"
]
}
],
"onEnterRules": [
{
"": "// e.g. /** | */",
"beforeText": {
"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
},
"afterText": {
"pattern": "^\\s*\\*/$"
},
"action": {
"indent": "indentOutdent",
"appendText": " * "
}
},
{
"": "// e.g. /** ...|",
"beforeText": {
"pattern": "^\\s*/\\*\\*(?!/)([^\\*]|\\*(?!/))*$"
},
"action": {
"indent": "none",
"appendText": " * "
}
},
{
"": "// e.g. * ...|",
"beforeText": {
"pattern": "^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
},
"previousLineText": {
"pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"
},
"action": {
"indent": "none",
"appendText": "* "
}
},
{
"": "// e.g. */|",
"beforeText": {
"pattern": "^(\\t|[ ])*[ ]\\*/\\s*$"
},
"action": {
"indent": "none",
"removeText": 1
}
},
{
"beforeText": ":\\s*$",
"action": {
"indent": "indent"
}
},
{
"beforeText": ";\\s*$",
"action": {
"indent": "outdent"
}
}
]
}
Loading

0 comments on commit fcfe8a3

Please sign in to comment.