Merge pull request #621 from jvalue/620-monaco-editor-langium-files

`monaco-editor` exports information for the hub

apps/vs-code-extension/assets/language-configuration.json

@@ -1,25 +1,16 @@
 {
   "comments": {
-    // symbol used for single line comment. Remove this entry if your language does not support line comments
     "lineComment": "//",
-    // symbols used for start and end a block comment. Remove this entry if your language does not support block comments
     "blockComment": ["/*", "*/"]
   },
-  // symbols used as brackets
-  "brackets": [
-    ["{", "}"],
-    ["[", "]"],
-    ["(", ")"]
-  ],
-  // symbols that are auto closed when typing
+  "brackets": [["{", "}"], ["[", "]"], ["(", ")"]],
   "autoClosingPairs": [
     ["{", "}"],
     ["[", "]"],
     ["(", ")"],
     ["\"", "\""],
     ["'", "'"]
   ],
-  // symbols that can be used to surround a selection
   "surroundingPairs": [
     ["{", "}"],
     ["[", "]"],

libs/language-server/langium-config.json

@@ -8,9 +8,6 @@
       "textMate": {
         "out": "../../apps/vs-code-extension/assets/jayvee.tmLanguage.json"
       },
-      "monarch": {
-        "out": "../../libs/monaco-editor/src/lib/jayvee.monarch.ts"
-      },
       "prism": {
         "out": "../../apps/docs/src/theme/prism-jayvee.js"
       }

libs/language-server/project.json

@@ -9,21 +9,23 @@
       "cache": true,
       "inputs": [
         "{projectRoot}/langium-config.json",
-        "{workspaceRoot}/tools/scripts/fix-monarch-grammar-escape.mjs",
+        "{workspaceRoot}/apps/vs-code-extension/assets/language-configuration.json",
+        "{workspaceRoot}/tools/scripts/monaco-editor/copy-textmate-grammar.mjs",
         "{workspaceRoot}/tools/scripts/language-server/generate-stdlib.mjs",
         "{projectRoot}/src/grammar/**/*"
       ],
       "outputs": [
         "{workspaceRoot}/apps/vs-code-extension/assets/jayvee.tmLanguage.json",
-        "{workspaceRoot}/libs/monaco-editor/src/lib/jayvee.monarch.ts",
+        "{workspaceRoot}/libs/monaco-editor/src/lib/jayvee.tmLanguage.json",
+        "{workspaceRoot}/libs/monaco-editor/src/lib/language-configuration.json",
         "{workspaceRoot}/apps/docs/src/theme/prism-jayvee.js",
         "{projectRoot}/src/lib/ast/generated"
       ],
       "options": {
         "commands": [
           "langium generate -f libs/language-server/langium-config.json",
-          // Workaround until https://github.com/langium/langium/issues/740 is resolved:
-          "node tools/scripts/fix-monarch-grammar-escape.mjs",
+          "node tools/scripts/monaco-editor/copy-textmate-grammar.mjs",
+          "node tools/scripts/monaco-editor/copy-language-configuration.mjs",
           "node tools/scripts/language-server/generate-stdlib.mjs"
         ],
         "parallel": false

libs/monaco-editor/.gitignore

@@ -3,4 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 # file generated by Langium
-src/lib/jayvee.monarch.ts
+src/lib/jayvee.tmLanguage.json
+# file copied from vs-code-extension
+src/lib/language-configuration.json

libs/monaco-editor/project.json

@@ -3,13 +3,13 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/monaco-editor/src",
   "projectType": "library",
-  "tags": [],
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"]
     },
     "build": {
+      "dependsOn": ["^build", "generate"],
       "executor": "@nx/rollup:rollup",
       "outputs": ["{options.outputPath}"],
       "options": {
@@ -42,8 +42,6 @@
       "options": {
         "commands": [
           "node tools/scripts/relax-peer-dependency-versions.mjs monaco-editor",
-          "node tools/scripts/monaco-editor/delete-vscode-peer-dependency.mjs monaco-editor",
-          "node tools/scripts/monaco-editor/relax-react-version.mjs monaco-editor",
           "node tools/scripts/add-package-json-version.mjs monaco-editor",
           "node tools/scripts/publish.mjs monaco-editor false" // dry-run
         ],

libs/monaco-editor/src/lib/monaco-editor.ts

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 Friedrich-Alexander-Universitat Erlangen-Nurnberg
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import tmGrammar from './jayvee.tmLanguage.json';
+import config from './language-configuration.json';
+
+export function getTextMateGrammar(): unknown {
+  return tmGrammar;
+}
+
+export function getLanguageConfiguration(): unknown {
+  return config;
+}