fix CI

serkonda7 · Jan 15, 2024 · d322d60 · d322d60
1 parent 9f7cf36
commit d322d60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -64,12 +64,12 @@
 			{
 				"language": "vba",
 				"scopeName": "source.vba",
-				"path": "./out/vba.tmGrammar.json"
+				"path": "./out/vba.json"
 			},
 			{
 				"language": "wwb",
 				"scopeName": "source.wwb",
-				"path": "./out/wwb.tmGrammar.json"
+				"path": "./out/wwb.json"
 			}
 		],
 		"commands": [
@@ -110,8 +110,8 @@
 	"scripts": {
 		"compile": "bait --library -o out/extension.js src",
 		"test": "pnpm run convert-yaml && pnpm run test-vba && pnpm run test-wwb",
-		"test-vba": "vscode-tmgrammar-test -g ./out/vba.tmGrammar.json \"syntaxes/tests/vba/*.bas\"",
-		"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.tmGrammar.json \"syntaxes/tests/other/*.wwd\"",
+		"test-vba": "vscode-tmgrammar-test -g ./out/vba.json \"syntaxes/tests/vba/*.bas\"",
+		"test-wwb": "vscode-tmgrammar-test -g ./out/wwb.json \"syntaxes/tests/other/*.wwd\"",
 		"install-dev-ext": "vsce package -o ./out/vscode-vba-dev.vsix && code --install-extension ./out/vscode-vba-dev.vsix --force",
 		"package": "vsce package",
 		"convert-yaml": "yaml2json language-configuration.yml \"syntaxes/*.yaml-tmlanguage\"",

diff --git a/scripts/gen_json_grammar.bt b/scripts/gen_json_grammar.bt
@@ -67,7 +67,7 @@ fun main() {
 }
 
 fun copy_grammar(lang string, min_size i32) {
-	src := './out/${lang}.tmGrammar.json'
+	src := './out/${lang}..json'
 
 	// Sanity check for a reasonable file size
 	text := os.read_file(src)
@@ -77,7 +77,7 @@ fun copy_grammar(lang string, min_size i32) {
 	}
 
 	// Copy
-	os.cp(src, '${REPO_DIR}/syntaxes/${lang}.tmGrammar.json')
+	os.cp(src, '${REPO_DIR}/syntaxes/${lang}.json')
 }
 
 fun git_command(cmd string) i32 {