Don't stringify the JSON data

jvalue · Oct 4, 2024 · ca88146 · ca88146
1 parent 8e37c12
commit ca88146
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/libs/language-server/project.json b/libs/language-server/project.json
@@ -16,8 +16,8 @@
       ],
       "outputs": [
         "{workspaceRoot}/apps/vs-code-extension/assets/jayvee.tmLanguage.json",
-        "{workspaceRoot}/libs/monaco-editor/src/lib/generated/jayvee.tmLanguage.json",
-        "{workspaceRoot}/libs/monaco-editor/src/lib/generated/language-configuration.json",
+        "{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"
       ],

diff --git a/libs/monaco-editor/.gitignore b/libs/monaco-editor/.gitignore
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 # file generated by Langium
-src/lib/generated/jayvee.tmLanguage.json
+src/lib/jayvee.tmLanguage.json
 # file copied from vs-code-extension
-src/lib/generated/language-configuration.json
+src/lib/language-configuration.json
diff --git a/libs/monaco-editor/src/lib/monaco-editor.ts b/libs/monaco-editor/src/lib/monaco-editor.ts
@@ -1,10 +1,10 @@
-import tmGrammar from './generated/jayvee.tmLanguage.json';
-import config from './generated/language-configuration.json';
+import tmGrammar from './jayvee.tmLanguage.json';
+import config from './language-configuration.json';
 
-export function getTextMateGrammar(): string {
-  return JSON.stringify(tmGrammar);
+export function getTextMateGrammar(): unknown {
+  return tmGrammar;
 }
 
-export function getLanguageConfiguration(): string {
-  return JSON.stringify(config);
+export function getLanguageConfiguration(): unknown {
+  return config;
 }
diff --git a/tools/scripts/monaco-editor/copy-language-configuration.mjs b/tools/scripts/monaco-editor/copy-language-configuration.mjs
@@ -17,7 +17,6 @@ const confVscode = join(
 const confMonaco = join(
   getSourcePath('monaco-editor'),
   'lib',
-  'generated',
   'language-configuration.json',
 );
 

diff --git a/tools/scripts/monaco-editor/copy-textmate-grammar.mjs b/tools/scripts/monaco-editor/copy-textmate-grammar.mjs
@@ -17,7 +17,6 @@ const tmVscode = join(
 const tmMonaco = join(
   getSourcePath('monaco-editor'),
   'lib',
-  'generated',
   'jayvee.tmLanguage.json',
 );