From 9f0b115eef9c14c2d8c585e44d0de2946595409b Mon Sep 17 00:00:00 2001 From: Joshua Raphael Date: Sat, 8 Nov 2025 12:38:50 -0700 Subject: [PATCH 1/2] refactor for linugist package --- scripts/generate.sh | 6 +++--- RAScript.xml => syntaxes/RAScript.xml | 2 +- rascript.js => syntaxes/rascript.js | 2 +- .../rascript.tmLanguage.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename RAScript.xml => syntaxes/RAScript.xml (99%) rename rascript.js => syntaxes/rascript.js (99%) rename rascript.tmLanguage.json => syntaxes/rascript.tmLanguage.json (99%) diff --git a/scripts/generate.sh b/scripts/generate.sh index a43dcba..536db8f 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -6,7 +6,7 @@ if [[ ${GITHUB_REF_NAME} != "" ]]; then VERSION="$GITHUB_REF_NAME" fi -sed "s//$VERSION/g" rascript.tmLanguage.json > gen/rascript.tmLanguage.json +sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/rascript.tmLanguage.json > gen/rascript.tmLanguage.json plistutil -f xml -i gen/rascript.tmLanguage.json -o gen/rascript.tmLanguage -sed "s//$VERSION/g" RAScript.xml > gen/RAScript.xml -sed "s//$VERSION/g" rascript.js > gen/rascript.js \ No newline at end of file +sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/RAScript.xml > gen/RAScript.xml +sed "s/_GRAMMAR_VERSION_/$VERSION/g" syntaxes/rascript.js > gen/rascript.js \ No newline at end of file diff --git a/RAScript.xml b/syntaxes/RAScript.xml similarity index 99% rename from RAScript.xml rename to syntaxes/RAScript.xml index ff55acd..c82903e 100644 --- a/RAScript.xml +++ b/syntaxes/RAScript.xml @@ -62,7 +62,7 @@ - + diff --git a/rascript.js b/syntaxes/rascript.js similarity index 99% rename from rascript.js rename to syntaxes/rascript.js index 4e8b1f9..4624d8c 100644 --- a/rascript.js +++ b/syntaxes/rascript.js @@ -3,7 +3,7 @@ Language: RAScript Author: Joshua Raphael Description: Syntax grammar for RAScript, a RetroAchievements.org DSL Category: syntax -Version: +Version: _GRAMMAR_VERSION_ */ function ImportantWordRegex() { diff --git a/rascript.tmLanguage.json b/syntaxes/rascript.tmLanguage.json similarity index 99% rename from rascript.tmLanguage.json rename to syntaxes/rascript.tmLanguage.json index ce9aec5..22d87c4 100644 --- a/rascript.tmLanguage.json +++ b/syntaxes/rascript.tmLanguage.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", - "$version": "", + "grammar_version": "_GRAMMAR_VERSION_", "name": "RAScript", "patterns": [ { From 5b8d25c40f898c725532230987976148fee56eae Mon Sep 17 00:00:00 2001 From: Joshua Raphael Date: Sat, 8 Nov 2025 12:51:17 -0700 Subject: [PATCH 2/2] change version key in tmLanguage --- syntaxes/rascript.tmLanguage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntaxes/rascript.tmLanguage.json b/syntaxes/rascript.tmLanguage.json index 22d87c4..9763e35 100644 --- a/syntaxes/rascript.tmLanguage.json +++ b/syntaxes/rascript.tmLanguage.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", - "grammar_version": "_GRAMMAR_VERSION_", + "version": "_GRAMMAR_VERSION_", "name": "RAScript", "patterns": [ {