redscript-mc 1.0.0 → 1.1.0

package/dist/mc-test/runner.d.ts

@@ -1,11 +1,11 @@
 /**
  * RedScript MC Integration Test Runner
  *
- * Compiles a .rs file, installs it to a running Paper server,
+ * Compiles a .mcrs file, installs it to a running Paper server,
  * runs test scenarios, and reports results.
  *
  * Usage:
- *   npx ts-node src/mc-test/runner.ts src/examples/counter.rs
+ *   npx ts-node src/mc-test/runner.ts src/examples/counter.mcrs
  *
  * Requires:
  *   - Paper server running with TestHarnessPlugin

package/dist/mc-test/runner.js

@@ -2,11 +2,11 @@
 /**
  * RedScript MC Integration Test Runner
  *
- * Compiles a .rs file, installs it to a running Paper server,
+ * Compiles a .mcrs file, installs it to a running Paper server,
  * runs test scenarios, and reports results.
  *
  * Usage:
- *   npx ts-node src/mc-test/runner.ts src/examples/counter.rs
+ *   npx ts-node src/mc-test/runner.ts src/examples/counter.mcrs
  *
  * Requires:
  *   - Paper server running with TestHarnessPlugin
@@ -115,7 +115,7 @@ async function runMCTests(sourceFile, tests, options = {}) {
 if (require.main === module) {
     const sourceFile = process.argv[2];
     if (!sourceFile) {
-        console.error('Usage: ts-node runner.ts <source.rs>');
+        console.error('Usage: ts-node runner.ts <source.mcrs>');
         process.exit(1);
     }
     // Example test suite (replace with actual tests)

package/dist/mc-test/setup.js

@@ -66,12 +66,12 @@ function main() {
     // Example files
     const exampleNamespaces = ['counter', 'world_manager'];
     for (const ns of exampleNamespaces) {
-        const file = path.join(EXAMPLES_DIR, `${ns}.rs`);
+        const file = path.join(EXAMPLES_DIR, `${ns}.mcrs`);
         if (fs.existsSync(file)) {
             writeFixture(fs.readFileSync(file, 'utf-8'), ns);
         }
         else {
-            console.log(`  ⚠ ${ns}.rs not found, skipping`);
+            console.log(`  ⚠ ${ns}.mcrs not found, skipping`);
         }
     }
     // Inline test fixtures

package/dist/parser/index.d.ts

@@ -24,6 +24,7 @@ export declare class Parser {
     private parseStructDecl;
     private parseEnumDecl;
     private parseConstDecl;
+    private parseGlobalDecl;
     private parseFnDecl;
     private parseDecorators;
     private parseDecoratorValue;
@@ -68,6 +69,7 @@ export declare class Parser {
     private parseCoordComponent;
     private parseSignedCoordOffset;
     private parseSelector;
+    private parseSelectorOrVarSelector;
     private parseSelectorValue;
     private parseSelectorFilters;
     private splitSelectorParams;

package/dist/parser/index.js

@@ -99,6 +99,7 @@ class Parser {
     // -------------------------------------------------------------------------
     parse(defaultNamespace = 'redscript') {
         let namespace = defaultNamespace;
+        const globals = [];
         const declarations = [];
         const structs = [];
         const enums = [];
@@ -112,7 +113,10 @@ class Parser {
         }
         // Parse struct and function declarations
         while (!this.check('eof')) {
-            if (this.check('struct')) {
+            if (this.check('let')) {
+                globals.push(this.parseGlobalDecl(true));
+            }
+            else if (this.check('struct')) {
                 structs.push(this.parseStructDecl());
             }
             else if (this.check('enum')) {
@@ -125,7 +129,7 @@ class Parser {
                 declarations.push(this.parseFnDecl());
             }
         }
-        return { namespace, declarations, structs, enums, consts };
+        return { namespace, globals, declarations, structs, enums, consts };
     }
     // -------------------------------------------------------------------------
     // Struct Declaration
@@ -181,6 +185,16 @@ class Parser {
         this.match(';');
         return this.withLoc({ name, type, value }, constToken);
     }
+    parseGlobalDecl(mutable) {
+        const token = this.advance(); // consume 'let'
+        const name = this.expect('ident').value;
+        this.expect(':');
+        const type = this.parseType();
+        this.expect('=');
+        const init = this.parseExpr();
+        this.expect(';');
+        return this.withLoc({ kind: 'global', name, type, init, mutable }, token);
+    }
     // -------------------------------------------------------------------------
     // Function Declaration
     // -------------------------------------------------------------------------
@@ -534,16 +548,16 @@ class Parser {
                 if (this.peek().kind === 'ident' && this.peek().value === 'entity') {
                     this.advance(); // consume 'entity'
                 }
-                const selector = this.parseSelector();
-                subcommands.push({ kind: 'if_entity', selector });
+                const selectorOrVar = this.parseSelectorOrVarSelector();
+                subcommands.push({ kind: 'if_entity', ...selectorOrVar });
             }
             else if (this.match('unless')) {
                 // Expect 'entity' keyword (as ident) or just parse selector directly  
                 if (this.peek().kind === 'ident' && this.peek().value === 'entity') {
                     this.advance(); // consume 'entity'
                 }
-                const selector = this.parseSelector();
-                subcommands.push({ kind: 'unless_entity', selector });
+                const selectorOrVar = this.parseSelectorOrVarSelector();
+                subcommands.push({ kind: 'unless_entity', ...selectorOrVar });
             }
             else if (this.match('in')) {
                 const dim = this.expect('ident').value;
@@ -645,6 +659,10 @@ class Parser {
                         'has_tag': '__entity_has_tag',
                         'push': '__array_push',
                         'pop': '__array_pop',
+                        'add': 'set_add',
+                        'contains': 'set_contains',
+                        'remove': 'set_remove',
+                        'clear': 'set_clear',
                     };
                     const internalFn = methodMap[expr.field];
                     if (internalFn) {
@@ -653,7 +671,11 @@ class Parser {
                         expr = this.withLoc({ kind: 'call', fn: internalFn, args: [expr.obj, ...args] }, this.getLocToken(expr) ?? openParenToken);
                         continue;
                     }
-                    this.error(`Unknown method '${expr.field}'`);
+                    // Generic method sugar: obj.method(args) → method(obj, args)
+                    const args = this.parseArgs();
+                    this.expect(')');
+                    expr = this.withLoc({ kind: 'call', fn: expr.field, args: [expr.obj, ...args] }, this.getLocToken(expr) ?? openParenToken);
+                    continue;
                 }
                 const args = this.parseArgs();
                 this.expect(')');
@@ -1077,6 +1099,37 @@ class Parser {
         const token = this.expect('selector');
         return this.parseSelectorValue(token.value);
     }
+    // Parse either a selector (@a[...]) or a variable with filters (p[...])
+    // Returns { selector } for selectors or { varName, filters } for variables
+    parseSelectorOrVarSelector() {
+        if (this.check('selector')) {
+            return { selector: this.parseSelector() };
+        }
+        // Must be an identifier (variable) possibly with filters
+        const varToken = this.expect('ident');
+        const varName = varToken.value;
+        // Check for optional filters [...]
+        if (this.check('[')) {
+            this.advance(); // consume '['
+            // Collect everything until ']'
+            let filterStr = '';
+            let depth = 1;
+            while (depth > 0 && !this.check('eof')) {
+                if (this.check('['))
+                    depth++;
+                else if (this.check(']'))
+                    depth--;
+                if (depth > 0) {
+                    filterStr += this.peek().value ?? this.peek().kind;
+                    this.advance();
+                }
+            }
+            this.expect(']');
+            const filters = this.parseSelectorFilters(filterStr);
+            return { varName, filters };
+        }
+        return { varName };
+    }
     parseSelectorValue(value) {
         // Parse @e[type=zombie, distance=..5]
         const bracketIndex = value.indexOf('[');
@@ -1129,6 +1182,21 @@ class Parser {
                 case 'scores':
                     filters.scores = this.parseScoresFilter(val);
                     break;
+                case 'x':
+                    filters.x = this.parseRangeValue(val);
+                    break;
+                case 'y':
+                    filters.y = this.parseRangeValue(val);
+                    break;
+                case 'z':
+                    filters.z = this.parseRangeValue(val);
+                    break;
+                case 'x_rotation':
+                    filters.x_rotation = this.parseRangeValue(val);
+                    break;
+                case 'y_rotation':
+                    filters.y_rotation = this.parseRangeValue(val);
+                    break;
             }
         }
         return filters;

package/docs/COMPILATION_STATS.md

@@ -3,8 +3,8 @@
 Generated on 2026-03-12 with:
 
 ```bash
-for example in src/examples/*.rs; do
-  name=$(basename "$example" .rs)
+for example in src/examples/*.mcrs; do
+  name=$(basename "$example" .mcrs)
   TS_NODE_TRANSPILE_ONLY=1 npx ts-node src/cli.ts compile "$example" --stats -o /tmp/eval/$name 2>&1
 done
 ```
@@ -13,20 +13,20 @@ done
 
 | Example | Functions | Commands Before | Commands After | Savings |
 |:--|--:|--:|--:|--:|
-| `arena.rs` | 4 | 208 | 52 | 75% |
-| `counter.rs` | 1 | 76 | 19 | 75% |
-| `pvp_arena.rs` | 15 | 780 | 195 | 75% |
-| `quiz.rs` | 7 | 564 | 141 | 75% |
-| `rpg.rs` | 10 | 548 | 137 | 75% |
-| `shop.rs` | 2 | 160 | 40 | 75% |
-| `showcase_game.rs` | 89 | 3360 | 840 | 75% |
-| `stdlib_demo.rs` | 15 | 1104 | 276 | 75% |
-| `turret.rs` | 5 | 104 | 26 | 75% |
-| `world_manager.rs` | 3 | 80 | 20 | 75% |
+| `arena.mcrs` | 4 | 208 | 52 | 75% |
+| `counter.mcrs` | 1 | 76 | 19 | 75% |
+| `pvp_arena.mcrs` | 15 | 780 | 195 | 75% |
+| `quiz.mcrs` | 7 | 564 | 141 | 75% |
+| `rpg.mcrs` | 10 | 548 | 137 | 75% |
+| `shop.mcrs` | 2 | 160 | 40 | 75% |
+| `showcase_game.mcrs` | 89 | 3360 | 840 | 75% |
+| `stdlib_demo.mcrs` | 15 | 1104 | 276 | 75% |
+| `turret.mcrs` | 5 | 104 | 26 | 75% |
+| `world_manager.mcrs` | 3 | 80 | 20 | 75% |
 
 ## Per-example Optimizer Stats
 
-### `arena.rs`
+### `arena.mcrs`
 
 - Functions: `4`
 - Commands: `208 -> 52`
@@ -37,7 +37,7 @@ done
 - Dead code removed: `2`
 - Constant folds: `0`
 
-### `counter.rs`
+### `counter.mcrs`
 
 - Functions: `1`
 - Commands: `76 -> 19`
@@ -48,7 +48,7 @@ done
 - Dead code removed: `0`
 - Constant folds: `0`
 
-### `pvp_arena.rs`
+### `pvp_arena.mcrs`
 
 - Functions: `15`
 - Commands: `780 -> 195`
@@ -59,7 +59,7 @@ done
 - Dead code removed: `4`
 - Constant folds: `0`
 
-### `quiz.rs`
+### `quiz.mcrs`
 
 - Functions: `7`
 - Commands: `564 -> 141`
@@ -70,7 +70,7 @@ done
 - Dead code removed: `0`
 - Constant folds: `0`
 
-### `rpg.rs`
+### `rpg.mcrs`
 
 - Functions: `10`
 - Commands: `548 -> 137`
@@ -81,7 +81,7 @@ done
 - Dead code removed: `3`
 - Constant folds: `1`
 
-### `shop.rs`
+### `shop.mcrs`
 
 - Functions: `2`
 - Commands: `160 -> 40`
@@ -92,7 +92,7 @@ done
 - Dead code removed: `0`
 - Constant folds: `0`
 
-### `showcase_game.rs`
+### `showcase_game.mcrs`
 
 - Functions: `89`
 - Commands: `3360 -> 840`
@@ -103,7 +103,7 @@ done
 - Dead code removed: `20`
 - Constant folds: `1`
 
-### `stdlib_demo.rs`
+### `stdlib_demo.mcrs`
 
 - Functions: `15`
 - Commands: `1104 -> 276`
@@ -114,7 +114,7 @@ done
 - Dead code removed: `11`
 - Constant folds: `0`
 
-### `turret.rs`
+### `turret.mcrs`
 
 - Functions: `5`
 - Commands: `104 -> 26`
@@ -125,7 +125,7 @@ done
 - Dead code removed: `0`
 - Constant folds: `0`
 
-### `world_manager.rs`
+### `world_manager.mcrs`
 
 - Functions: `3`
 - Commands: `80 -> 20`
@@ -138,5 +138,5 @@ done
 
 ## Warnings Observed During Compilation
 
-- `showcase_game.rs`: warnings inherited from imported stdlib helpers using quoted selectors in `player.rs`, plus one auto-qualification warning for unnamespaced `zombie`.
-- `turret.rs`: auto-qualification warnings for unnamespaced `armor_stand` and `zombie`.
+- `showcase_game.mcrs`: warnings inherited from imported stdlib helpers using quoted selectors in `player.mcrs`, plus one auto-qualification warning for unnamespaced `zombie`.
+- `turret.mcrs`: auto-qualification warnings for unnamespaced `armor_stand` and `zombie`.

package/docs/IMPLEMENTATION_GUIDE.md

@@ -397,7 +397,7 @@ function rangeToString(r: RangeExpr): string {
 
 ### 测试 1：简单函数
 ```rs
-// input: src/test_programs/add.rs
+// input: src/test_programs/add.mcrs
 fn add(a: int, b: int) -> int {
     return a + b;
 }

package/docs/STRUCTURE_TARGET.md

@@ -7,7 +7,7 @@
 Compile a source file into a raw structure NBT:
 
 ```bash
-redscript compile --target structure src/examples/arena.rs -o arena.nbt
+redscript compile --target structure src/examples/arena.mcrs -o arena.nbt
 ```
 
 Then copy the generated file into your datapack's `structures/` folder, for example:

package/editors/vscode/.vscodeignore

@@ -8,3 +8,4 @@ tsconfig.json
 package-lock.json
 *.vsix
 # out/ is included (bundled extension)
+icons/

package/editors/vscode/icons/mcrs.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <rect x="1" y="1" width="14" height="14" rx="2" fill="#C75450"/>
+  <rect x="3" y="3" width="10" height="10" rx="1" fill="#E57373"/>
+  <rect x="5" y="6" width="6" height="4" fill="#FFCDD2"/>
+  <rect x="6" y="4" width="4" height="2" fill="#FFCDD2"/>
+  <rect x="6" y="10" width="4" height="2" fill="#FFCDD2"/>
+</svg>

package/editors/vscode/icons/redscript-icons.json

@@ -0,0 +1,10 @@
+{
+  "iconDefinitions": {
+    "_mcrs": {
+      "iconPath": "./mcrs.svg"
+    }
+  },
+  "fileExtensions": {
+    "mcrs": "_mcrs"
+  }
+}

package/editors/vscode/out/extension.js

@@ -1178,16 +1178,23 @@ var require_parser = __commonJS({
                 "untag": "__entity_untag",
                 "has_tag": "__entity_has_tag",
                 "push": "__array_push",
-                "pop": "__array_pop"
+                "pop": "__array_pop",
+                "add": "set_add",
+                "contains": "set_contains",
+                "remove": "set_remove",
+                "clear": "set_clear"
               };
               const internalFn = methodMap[expr.field];
               if (internalFn) {
-                const args2 = this.parseArgs();
+                const args3 = this.parseArgs();
                 this.expect(")");
-                expr = this.withLoc({ kind: "call", fn: internalFn, args: [expr.obj, ...args2] }, this.getLocToken(expr) ?? openParenToken);
+                expr = this.withLoc({ kind: "call", fn: internalFn, args: [expr.obj, ...args3] }, this.getLocToken(expr) ?? openParenToken);
                 continue;
               }
-              this.error(`Unknown method '${expr.field}'`);
+              const args2 = this.parseArgs();
+              this.expect(")");
+              expr = this.withLoc({ kind: "call", fn: expr.field, args: [expr.obj, ...args2] }, this.getLocToken(expr) ?? openParenToken);
+              continue;
             }
             const args = this.parseArgs();
             this.expect(")");
@@ -2397,7 +2404,7 @@ var require_lowering = __commonJS({
       subtitle: ([sel, msg]) => `title ${sel} subtitle {"text":"${msg}"}`,
       title_times: ([sel, fadeIn, stay, fadeOut]) => `title ${sel} times ${fadeIn} ${stay} ${fadeOut}`,
       announce: ([msg]) => `tellraw @a {"text":"${msg}"}`,
-      give: ([sel, item, count]) => `give ${sel} ${item} ${count ?? "1"}`,
+      give: ([sel, item, count, nbt]) => nbt ? `give ${sel} ${item}${nbt} ${count ?? "1"}` : `give ${sel} ${item} ${count ?? "1"}`,
       kill: ([sel]) => `kill ${sel ?? "@s"}`,
       effect: ([sel, eff, dur, amp]) => `effect give ${sel} ${eff} ${dur ?? "30"} ${amp ?? "0"}`,
       summon: ([type, x, y, z, nbt]) => {
@@ -2475,8 +2482,18 @@ var require_lowering = __commonJS({
       // Special handling
       team_option: () => null,
       // Special handling
-      data_get: () => null
+      data_get: () => null,
       // Special handling (returns value from NBT)
+      set_new: () => null,
+      // Special handling (returns set ID)
+      set_add: () => null,
+      // Special handling
+      set_contains: () => null,
+      // Special handling (returns 1/0)
+      set_remove: () => null,
+      // Special handling
+      set_clear: () => null
+      // Special handling
     };
     function getSpan(node) {
       return node?.span;
@@ -2774,6 +2791,12 @@ var require_lowering = __commonJS({
           }
           return;
         }
+        if (stmt.init.kind === "call" && stmt.init.fn === "set_new") {
+          const setId = `__set_${this.foreachCounter++}`;
+          this.builder.emitRaw(`data modify storage rs:sets ${setId} set value []`);
+          this.stringValues.set(stmt.name, setId);
+          return;
+        }
         if (stmt.init.kind === "call" && stmt.init.fn === "spawn_object") {
           const value2 = this.lowerExpr(stmt.init);
           if (value2.kind === "var" && value2.name.startsWith("@e[tag=__rs_obj_")) {
@@ -3735,6 +3758,35 @@ var require_lowering = __commonJS({
           this.builder.emitRaw(`execute store result score ${dst} rs run data get ${targetType} ${target} ${path} ${scale}`);
           return { kind: "var", name: dst };
         }
+        if (name === "set_new") {
+          const setId = `__set_${this.foreachCounter++}`;
+          this.builder.emitRaw(`data modify storage rs:sets ${setId} set value []`);
+          return { kind: "const", value: 0 };
+        }
+        if (name === "set_add") {
+          const setId = this.exprToString(args[0]);
+          const value = this.exprToString(args[1]);
+          this.builder.emitRaw(`execute unless data storage rs:sets ${setId}[{value:${value}}] run data modify storage rs:sets ${setId} append value {value:${value}}`);
+          return { kind: "const", value: 0 };
+        }
+        if (name === "set_contains") {
+          const dst = this.builder.freshTemp();
+          const setId = this.exprToString(args[0]);
+          const value = this.exprToString(args[1]);
+          this.builder.emitRaw(`execute store result score ${dst} rs if data storage rs:sets ${setId}[{value:${value}}]`);
+          return { kind: "var", name: dst };
+        }
+        if (name === "set_remove") {
+          const setId = this.exprToString(args[0]);
+          const value = this.exprToString(args[1]);
+          this.builder.emitRaw(`data remove storage rs:sets ${setId}[{value:${value}}]`);
+          return { kind: "const", value: 0 };
+        }
+        if (name === "set_clear") {
+          const setId = this.exprToString(args[0]);
+          this.builder.emitRaw(`data modify storage rs:sets ${setId} set value []`);
+          return { kind: "const", value: 0 };
+        }
         const coordCommand = this.lowerCoordinateBuiltin(name, args);
         if (coordCommand) {
           this.builder.emitRaw(coordCommand);
@@ -3759,7 +3811,7 @@ var require_lowering = __commonJS({
           }
           return { kind: "const", value: 0 };
         }
-        const strArgs = args.map((arg) => this.exprToString(arg));
+        const strArgs = args.map((arg) => arg.kind === "struct_lit" || arg.kind === "array_lit" ? this.exprToSnbt(arg) : this.exprToString(arg));
         const cmd = BUILTINS2[name](strArgs);
         if (cmd) {
           this.builder.emitRaw(cmd);
@@ -3913,6 +3965,36 @@ var require_lowering = __commonJS({
             return this.operandToVar(op);
         }
       }
+      exprToSnbt(expr) {
+        switch (expr.kind) {
+          case "struct_lit": {
+            const entries = expr.fields.map((f) => `${f.name}:${this.exprToSnbt(f.value)}`);
+            return `{${entries.join(",")}}`;
+          }
+          case "array_lit": {
+            const items = expr.elements.map((e) => this.exprToSnbt(e));
+            return `[${items.join(",")}]`;
+          }
+          case "str_lit":
+            return `"${expr.value}"`;
+          case "int_lit":
+            return String(expr.value);
+          case "float_lit":
+            return String(expr.value);
+          case "byte_lit":
+            return `${expr.value}b`;
+          case "short_lit":
+            return `${expr.value}s`;
+          case "long_lit":
+            return `${expr.value}L`;
+          case "double_lit":
+            return `${expr.value}d`;
+          case "bool_lit":
+            return expr.value ? "1b" : "0b";
+          default:
+            return this.exprToString(expr);
+        }
+      }
       exprToTargetString(expr) {
         if (expr.kind === "selector") {
           return this.selectorToString(expr.sel);
@@ -6495,16 +6577,52 @@ function findFnDeclLine(document, name) {
 }
 function findFnSignature(document, name) {
   const text = document.getText();
-  const re = new RegExp(`\\bfn\\s+${escapeRe(name)}\\s*\\(([^)]*)\\)(?:\\s*->\\s*([A-Za-z_][A-Za-z0-9_\\[\\]]*))?`, "m");
+  const re = new RegExp(`\\bfn\\s+${escapeRe(name)}\\s*\\(([^)]*)\\)(?:\\s*->\\s*([A-Za-z_][A-Za-z0-9_\\[\\]]*))?\\s*\\{`, "m");
   const match = re.exec(text);
   if (!match) return null;
   const params = match[1].trim();
-  const returnType = match[2];
+  let returnType = match[2];
+  if (!returnType) {
+    returnType = inferReturnType(text, match.index + match[0].length);
+  }
   if (returnType) {
     return `fn ${name}(${params}) -> ${returnType}`;
   }
   return `fn ${name}(${params})`;
 }
+function inferReturnType(text, bodyStart) {
+  let braceCount = 1;
+  let pos = bodyStart;
+  while (pos < text.length && braceCount > 0) {
+    if (text[pos] === "{") braceCount++;
+    else if (text[pos] === "}") braceCount--;
+    pos++;
+  }
+  const body = text.slice(bodyStart, pos - 1);
+  const returnMatch = body.match(/\breturn\s+(.+?);/);
+  if (!returnMatch) return null;
+  const returnExpr = returnMatch[1].trim();
+  if (/^\d+$/.test(returnExpr)) return "int";
+  if (/^\d+\.\d+$/.test(returnExpr)) return "float";
+  if (/^\d+[bB]$/.test(returnExpr)) return "byte";
+  if (/^\d+[sS]$/.test(returnExpr)) return "short";
+  if (/^\d+[lL]$/.test(returnExpr)) return "long";
+  if (/^\d+(\.\d+)?[dD]$/.test(returnExpr)) return "double";
+  if (/^".*"$/.test(returnExpr)) return "string";
+  if (/^(true|false)$/.test(returnExpr)) return "bool";
+  if (/^@[aeprs]/.test(returnExpr)) return "selector";
+  if (/^\{/.test(returnExpr)) return "struct";
+  if (/^\[/.test(returnExpr)) return "array";
+  const callMatch = returnExpr.match(/^(\w+)\s*\(/);
+  if (callMatch) {
+    const fnName = callMatch[1];
+    if (["scoreboard_get", "score", "random", "random_native", "str_len", "len", "data_get", "bossbar_get_value", "set_contains"].includes(fnName)) {
+      return "int";
+    }
+    if (fnName === "set_new") return "string";
+  }
+  return null;
+}
 function escapeRe(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -6978,6 +7096,23 @@ function isStructLiteralField(doc, position, word) {
   if (fnMatch) return fnMatch[1];
   return null;
 }
+function isMemberAccessField(doc, position, word) {
+  const line = doc.lineAt(position.line).text;
+  const wordStart = position.character;
+  const beforeWord = line.slice(0, wordStart);
+  if (!beforeWord.endsWith(".")) return null;
+  const varMatch = beforeWord.match(/(\w+)\s*\.$/);
+  if (!varMatch) return null;
+  const varName = varMatch[1];
+  const text = doc.getText();
+  const typeRe = new RegExp(`\\b(?:let|const)\\s+${varName}\\s*:\\s*(\\w+)`, "m");
+  const typeMatch = text.match(typeRe);
+  if (typeMatch) return typeMatch[1];
+  const paramRe = new RegExp(`\\((?:[^)]*,\\s*)?${varName}\\s*:\\s*(\\w+)`, "m");
+  const paramMatch = text.match(paramRe);
+  if (paramMatch) return paramMatch[1];
+  return null;
+}
 function findAllOccurrences(doc, word) {
   const text = doc.getText();
   const re = new RegExp(`\\b${escapeRegex(word)}\\b`, "g");
@@ -7010,6 +7145,14 @@ function registerSymbolProviders(context) {
             return new vscode4.Location(doc.uri, field.fieldRange);
           }
         }
+        const memberAccess = isMemberAccessField(doc, position, word);
+        if (memberAccess) {
+          const structFields = findStructFields(doc);
+          const field = structFields.find((f) => f.structName === memberAccess && f.fieldName === word);
+          if (field) {
+            return new vscode4.Location(doc.uri, field.fieldRange);
+          }
+        }
         const decls = findDeclarations(doc);
         const decl = decls.find((d) => d.name === word);
         if (!decl) return null;

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": "0.5.0",
+  "version": "0.8.2",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",
@@ -36,7 +36,7 @@
           "redscript"
         ],
         "extensions": [
-          ".rs"
+          ".mcrs"
         ],
         "configuration": "./redscript-language-configuration.json"
       },
@@ -116,7 +116,14 @@
           }
         ]
       }
-    }
+    },
+    "iconThemes": [
+      {
+        "id": "redscript-icons",
+        "label": "RedScript Icons",
+        "path": "./icons/redscript-icons.json"
+      }
+    ]
   },
   "scripts": {
     "compile": "node build.mjs",