redscript-mc 1.2.24 → 1.2.25

package/.github/workflows/publish-extension-on-ci.yml

@@ -64,6 +64,7 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git add editors/vscode/package.json editors/vscode/package-lock.json
           git commit -m "chore: auto-bump vscode extension to ${NEW_VER} [skip ci]" || echo "Nothing to commit"
+          git pull --rebase origin main || true
           git push
         id: bump
 

package/dist/codegen/mcfunction/index.js

@@ -336,6 +336,11 @@ function generateDatapackWithStats(module, options = {}) {
             const filePath = i === 0
                 ? `data/${ns}/function/${fn.name}.mcfunction`
                 : `data/${ns}/function/${fn.name}/${block.label}.mcfunction`;
+            // Skip empty continuation blocks (only contain the block comment, no real commands)
+            // Entry block (i === 0) is always emitted so the function file exists
+            const hasRealContent = lines.some(l => !l.startsWith('#') && l.trim() !== '');
+            if (i !== 0 && !hasRealContent)
+                continue;
             files.push({ path: filePath, content: lines.join('\n') });
         }
     }

package/dist/codegen/var-allocator.js

@@ -61,12 +61,16 @@ class VarAllocator {
      */
     toSourceMap() {
         const map = {};
-        for (const [orig, alloc] of this.varCache)
+        for (const [orig, alloc] of this.varCache) {
+            // Skip compiler-generated temporaries (start with _ followed by digits)
+            if (/^_\d+$/.test(orig))
+                continue;
             map[alloc] = orig;
+        }
         for (const [val, alloc] of this.constCache)
-            map[alloc] = `const(${val})`;
+            map[alloc] = `const:${val}`;
         for (const [suf, alloc] of this.internalCache)
-            map[alloc] = `__${suf}`;
+            map[alloc] = `internal:${suf}`;
         return map;
     }
 }

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.13",
+      "version": "1.0.16",
       "license": "MIT",
       "dependencies": {
         "redscript": "file:../../"
@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "redscript-mc",
-      "version": "1.2.24",
+      "version": "1.2.25",
       "license": "MIT",
       "bin": {
         "redscript": "dist/cli.js",

package/editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "redscript-vscode",
   "displayName": "RedScript for Minecraft",
   "description": "Syntax highlighting, error diagnostics, and language support for RedScript — a compiler targeting Minecraft Java Edition",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redscript-mc",
-  "version": "1.2.24",
+  "version": "1.2.25",
   "description": "A high-level programming language that compiles to Minecraft datapacks",
   "main": "dist/index.js",
   "bin": {

package/src/codegen/mcfunction/index.ts

@@ -384,6 +384,11 @@ export function generateDatapackWithStats(
         ? `data/${ns}/function/${fn.name}.mcfunction`
         : `data/${ns}/function/${fn.name}/${block.label}.mcfunction`
 
+      // Skip empty continuation blocks (only contain the block comment, no real commands)
+      // Entry block (i === 0) is always emitted so the function file exists
+      const hasRealContent = lines.some(l => !l.startsWith('#') && l.trim() !== '')
+      if (i !== 0 && !hasRealContent) continue
+
       files.push({ path: filePath, content: lines.join('\n') })
     }
   }

package/src/codegen/var-allocator.ts

@@ -63,9 +63,13 @@ export class VarAllocator {
    */
   toSourceMap(): Record<string, string> {
     const map: Record<string, string> = {}
-    for (const [orig, alloc] of this.varCache)    map[alloc] = orig
-    for (const [val,  alloc] of this.constCache)  map[alloc] = `const(${val})`
-    for (const [suf,  alloc] of this.internalCache) map[alloc] = `__${suf}`
+    for (const [orig, alloc] of this.varCache) {
+      // Skip compiler-generated temporaries (start with _ followed by digits)
+      if (/^_\d+$/.test(orig)) continue
+      map[alloc] = orig
+    }
+    for (const [val,  alloc] of this.constCache)    map[alloc] = `const:${val}`
+    for (const [suf,  alloc] of this.internalCache) map[alloc] = `internal:${suf}`
     return map
   }
 }