Implement review feedback

eclipse-langium · Oct 12, 2023 · da600ff · da600ff
1 parent fbe3907
commit da600ff
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/packages/generator-langium/templates/vscode/.package.json b/packages/generator-langium/templates/vscode/.package.json
@@ -16,7 +16,7 @@
         "grammars": [{
             "language": "<%= language-id %>",
             "scopeName": "source.<%= language-id %>",
-            "path": "./syntaxes/<%= language-id %>.tmLanguage.json"
+            "path": "syntaxes/<%= language-id %>.tmLanguage.json"
         }]
     },
     "activationEvents": [
@@ -29,7 +29,8 @@
         "watch": "concurrently -n tsc,esbuild -c blue,yellow \"tsc -b tsconfig.json --watch\" \"node esbuild.mjs --watch\""
     },
     "dependencies": {
-        "vscode-languageclient": "~8.1.0"
+        "vscode-languageclient": "~8.1.0",
+        "vscode-languageserver": "~8.1.0"
     },
     "devDependencies": {
         "@types/vscode": "~1.67.0",

diff --git a/packages/generator-langium/templates/web/.package.json b/packages/generator-langium/templates/web/.package.json
@@ -10,10 +10,11 @@
         "serve": "npm run dev"
     },
     "dependencies": {
+        "@codingame/monaco-vscode-editor-service-override": "~1.82.5",
+        "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5",
         "monaco-editor-workers": "~0.43.0",
         "monaco-editor-wrapper": "~3.3.0-next.2",
-        "@codingame/monaco-vscode-editor-service-override": "~1.82.5",
-        "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5"
+        "vscode-languageserver": "~8.0.2"
     },
     "devDependencies": {
         "vite": "~4.4.11"

diff --git a/packages/generator-langium/templates/web/langium-config.json b/packages/generator-langium/templates/web/langium-config.json
@@ -5,10 +5,10 @@
         "grammar": "src/language/<%= language-id %>.langium",
         "fileExtensions": <%= file-extension %>,
         "textMate": {
-            "out": "static/syntaxes/<%= language-id %>.tmLanguage.json"
+            "out": "syntaxes/<%= language-id %>.tmLanguage.json"
         },
         "monarch": {
-            "out": "static/syntaxes/<%= language-id %>.monarch.ts"
+            "out": "syntaxes/<%= language-id %>.monarch.ts"
         }
     }],
     "out": "src/language/generated"

diff --git a/packages/generator-langium/templates/web/scripts/prepare.js b/packages/generator-langium/templates/web/scripts/prepare.js
@@ -1,7 +1,7 @@
 import { cp, existsSync, mkdirSync } from "node:fs";
 
-if (!existsSync('./static/syntaxes')) {
-    mkdirSync('./static/syntaxes');
+if (!existsSync('./syntaxes')) {
+    mkdirSync('./syntaxes');
 }
 if (!existsSync('./static/worker')) {
     mkdirSync('./static/worker');

diff --git a/packages/generator-langium/templates/web/static/setupClassic.js b/packages/generator-langium/templates/web/static/setupClassic.js
@@ -1,5 +1,5 @@
 import { addMonacoStyles, defineUserServices, MonacoEditorLanguageClientWrapper } from './bundle/index.js';
-import monarchSyntax from "./syntaxes/<%= language-id %>.monarch.js";
+import monarchSyntax from "../syntaxes/<%= language-id %>.monarch.js";
 import { configureWorker } from './setup.js';
 
 addMonacoStyles('monaco-editor-styles');

diff --git a/packages/generator-langium/templates/web/static/setupExtended.js b/packages/generator-langium/templates/web/static/setupExtended.js
@@ -6,7 +6,7 @@ addMonacoStyles('monaco-editor-styles');
 export const setupConfigExtended = () => {
     const extensionFilesOrContents = new Map();
     const languageConfigUrl = new URL('../language-configuration.json', window.location.href);
-    const textmateConfigUrl = new URL('./syntaxes/<%= language-id %>.tmLanguage.json', window.location.href);
+    const textmateConfigUrl = new URL('../syntaxes/<%= language-id %>.tmLanguage.json', window.location.href);
     extensionFilesOrContents.set('/language-configuration.json', languageConfigUrl);
     extensionFilesOrContents.set('/<%= language-id %>-grammar.json', textmateConfigUrl);
 

diff --git a/packages/generator-langium/templates/web/tsconfig.monarch.json b/packages/generator-langium/templates/web/tsconfig.monarch.json
@@ -3,7 +3,7 @@
         "target": "ES2017",
         "module": "ESNext",
         "sourceMap": true,
-        "outDir": "static/syntaxes",
+        "outDir": "syntaxes",
         "strict": true,
         "noUnusedLocals": true,
         "noImplicitReturns": true,
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "include": [
-        "static/syntaxes/<%= language-id %>.monarch.ts"
+        "syntaxes/<%= language-id %>.monarch.ts"
     ],
     "exclude": ["out", "node_modules"]
 }