redscript-mc 2.0.0 → 2.1.0

package/editors/vscode/package-lock.json

@@ -1,15 +1,16 @@
 {
   "name": "redscript-vscode",
-  "version": "1.2.2",
+  "version": "1.2.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.2.2",
+      "version": "1.2.8",
       "license": "MIT",
       "dependencies": {
-        "redscript": "file:../../"
+        "redscript": "file:../../",
+        "vscode-languageclient": "^9.0.1"
       },
       "devDependencies": {
         "@types/node": "^20.0.0",
@@ -23,11 +24,16 @@
     },
     "../..": {
       "name": "redscript-mc",
-      "version": "1.2.30",
+      "version": "2.1.0",
       "license": "MIT",
+      "dependencies": {
+        "vscode-languageserver": "^9.0.1",
+        "vscode-languageserver-textdocument": "^1.0.12"
+      },
       "bin": {
-        "redscript": "dist/cli.js",
-        "rsc": "dist/cli.js"
+        "redscript": "dist/src/cli.js",
+        "redscript-lsp": "dist/src/lsp/main.js",
+        "rsc": "dist/src/cli.js"
       },
       "devDependencies": {
         "@types/jest": "^29.5.0",
@@ -497,6 +503,21 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.27.3",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz",
@@ -539,10 +560,34 @@
         "@esbuild/win32-x64": "0.27.3"
       }
     },
+    "node_modules/minimatch": {
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/redscript": {
       "resolved": "../..",
       "link": true
     },
+    "node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
@@ -563,6 +608,45 @@
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
       "license": "MIT"
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+      "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
+      "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+      "license": "MIT",
+      "dependencies": {
+        "minimatch": "^5.1.0",
+        "semver": "^7.3.7",
+        "vscode-languageserver-protocol": "3.17.5"
+      },
+      "engines": {
+        "vscode": "^1.82.0"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+      "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-jsonrpc": "8.2.0",
+        "vscode-languageserver-types": "3.17.5"
+      }
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+      "license": "MIT"
     }
   }
 }

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.2.2",
+  "version": "1.2.8",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",
@@ -139,6 +139,7 @@
     "typescript": "^5.3.0"
   },
   "dependencies": {
-    "redscript": "file:../../"
+    "redscript": "file:../../",
+    "vscode-languageclient": "^9.0.1"
   }
 }

package/editors/vscode/src/extension.ts

@@ -1,8 +1,16 @@
 import * as vscode from 'vscode'
+import * as path from 'path'
+import {
+  LanguageClient,
+  LanguageClientOptions,
+  ServerOptions,
+  TransportKind,
+} from 'vscode-languageclient/node'
 import { registerHoverProvider } from './hover'
 import { registerCodeActions } from './codeactions'
 import { registerCompletionProvider } from './completion'
 import { registerSymbolProviders } from './symbols'
+
 // The compiler is bundled directly into this extension by esbuild.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { compile: _compile } = require('redscript') as {
@@ -18,11 +26,97 @@ function getCompile() {
 
 const DEBOUNCE_MS = 600
 
+let lspClient: LanguageClient | undefined
+
+/**
+ * Try to resolve the redscript-lsp binary.
+ * Returns the path if found (as installed alongside the redscript npm package),
+ * or null if not available.
+ */
+function resolveLspServerPath(): string | null {
+  // When the extension bundles redscript, the LSP server is at
+  // node_modules/redscript/dist/src/lsp/main.js relative to the extension dir.
+  try {
+    // __dirname is the extension's out/ directory when bundled by esbuild.
+    const candidate = path.join(__dirname, '..', 'node_modules', 'redscript', 'dist', 'src', 'lsp', 'main.js')
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    require('fs').accessSync(candidate)
+    return candidate
+  } catch {
+    // Not found via local node_modules; try the global bin
+    return null
+  }
+}
+
 export function activate(context: vscode.ExtensionContext): void {
+  // -------------------------------------------------------------------------
+  // LSP client (primary path)
+  // -------------------------------------------------------------------------
+  const serverModule = resolveLspServerPath()
+  if (serverModule) {
+    const serverOptions: ServerOptions = {
+      run:   { module: serverModule, transport: TransportKind.stdio },
+      debug: { module: serverModule, transport: TransportKind.stdio },
+    }
+
+    const clientOptions: LanguageClientOptions = {
+      documentSelector: [{ scheme: 'file', language: 'redscript' }],
+      synchronize: {
+        fileEvents: vscode.workspace.createFileSystemWatcher('**/*.mcrs'),
+      },
+      outputChannelName: 'RedScript LSP',
+    }
+
+    lspClient = new LanguageClient(
+      'redscript-lsp',
+      'RedScript Language Server',
+      serverOptions,
+      clientOptions,
+    )
+
+    lspClient.start()
+    context.subscriptions.push({ dispose: () => lspClient?.stop() })
+  } else {
+    // -----------------------------------------------------------------------
+    // Fallback: bundled compiler diagnostics (no redscript-lsp available)
+    // -----------------------------------------------------------------------
+    activateFallbackDiagnostics(context)
+  }
+
+  // -------------------------------------------------------------------------
+  // Providers that always run regardless of LSP availability
+  // -------------------------------------------------------------------------
+  registerHoverProvider(context)
+  registerCompletionProvider(context)
+  registerCodeActions(context)
+  registerSymbolProviders(context)
+
+  // Status bar
+  const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 10)
+  statusBar.text = serverModule ? '$(pass) RedScript LSP' : '$(pass) RedScript'
+  statusBar.tooltip = serverModule ? 'RedScript Language Server active' : 'RedScript compiler'
+  statusBar.show()
+  context.subscriptions.push(statusBar)
+
+  context.subscriptions.push(
+    vscode.window.onDidChangeActiveTextEditor(editor => {
+      if (editor?.document.languageId === 'redscript') {
+        statusBar.show()
+      } else {
+        statusBar.hide()
+      }
+    })
+  )
+}
+
+// ---------------------------------------------------------------------------
+// Fallback: bundled-compiler diagnostics (used when redscript-lsp is absent)
+// ---------------------------------------------------------------------------
+
+function activateFallbackDiagnostics(context: vscode.ExtensionContext): void {
   const diagnostics = vscode.languages.createDiagnosticCollection('redscript')
   context.subscriptions.push(diagnostics)
 
-  // Debounce timer per document URI
   const timers = new Map<string, NodeJS.Timeout>()
 
   function scheduleValidation(doc: vscode.TextDocument) {
@@ -36,17 +130,12 @@ export function activate(context: vscode.ExtensionContext): void {
     }, DEBOUNCE_MS))
   }
 
-  // Validate on open
   context.subscriptions.push(
     vscode.workspace.onDidOpenTextDocument(doc => scheduleValidation(doc))
   )
-
-  // Validate on change
   context.subscriptions.push(
     vscode.workspace.onDidChangeTextDocument(e => scheduleValidation(e.document))
   )
-
-  // Clear diagnostics on close
   context.subscriptions.push(
     vscode.workspace.onDidCloseTextDocument(doc => {
       diagnostics.delete(doc.uri)
@@ -56,40 +145,9 @@ export function activate(context: vscode.ExtensionContext): void {
     })
   )
 
-  // Validate all already-open .rs files
   vscode.workspace.textDocuments
     .filter(d => d.languageId === 'redscript')
     .forEach(d => scheduleValidation(d))
-
-  // Register hover documentation
-  registerHoverProvider(context)
-
-  // Register completions
-  registerCompletionProvider(context)
-
-  // Register code actions (quick fixes)
-  registerCodeActions(context)
-
-  // Register Go-to-Definition and Find-References
-  registerSymbolProviders(context)
-
-  // Status bar item to show compilation state
-  const statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 10)
-  statusBar.text = '$(pass) RedScript'
-  statusBar.tooltip = 'RedScript compiler'
-  statusBar.show()
-  context.subscriptions.push(statusBar)
-
-  // Track the active editor's compile state
-  context.subscriptions.push(
-    vscode.window.onDidChangeActiveTextEditor(editor => {
-      if (editor?.document.languageId === 'redscript') {
-        statusBar.show()
-      } else {
-        statusBar.hide()
-      }
-    })
-  )
 }
 
 function validateDocument(
@@ -98,7 +156,6 @@ function validateDocument(
 ): void {
   const compile = getCompile()
   if (!compile) {
-    // Compiler not available — show a one-time info message
     collection.set(doc.uri, [{
       message: 'RedScript compiler not found. Run `npm install -g redscript` to enable diagnostics.',
       range: new vscode.Range(0, 0, 0, 0),
@@ -114,9 +171,7 @@ function validateDocument(
   try {
     const result = compile(source, { filePath: doc.uri.fsPath })
 
-    // Convert warnings to VS Code diagnostics
     for (const w of result.warnings ?? []) {
-      // Use real line/col from AST span when available, fall back to text search
       const range = (w.line && w.col)
         ? new vscode.Range(w.line - 1, w.col - 1, w.line - 1, w.col - 1 + 20)
         : findWarningRange(w.message, w.code, source, doc)
@@ -131,7 +186,6 @@ function validateDocument(
   } catch (err: unknown) {
     const msg = err instanceof Error ? err.message : String(err)
 
-    // Try to get location from DiagnosticError.location first
     let range: vscode.Range
     const loc = (err as { location?: { line?: number; col?: number } }).location
     if (loc?.line && loc?.col) {
@@ -139,7 +193,6 @@ function validateDocument(
       const c = Math.max(0, loc.col - 1)
       range = new vscode.Range(l, c, l, c + 20)
     } else {
-      // Fallback: parse the error message for line/column info
       range = extractRange(msg, doc)
     }
 
@@ -154,40 +207,27 @@ function validateDocument(
   collection.set(doc.uri, docDiagnostics)
 }
 
-/**
- * For warnings without position info, search the source for the relevant token
- * mentioned in the warning message.
- */
 function findWarningRange(
   message: string,
   code: string | undefined,
   source: string,
   doc: vscode.TextDocument
 ): vscode.Range {
-  // W_UNNAMESPACED_TYPE: message contains the unqualified type name in quotes
-  // e.g. 'Unnamespaced entity type "zombie"'
   if (code === 'W_UNNAMESPACED_TYPE') {
     const m = message.match(/"([^"]+)"/)
     if (m) return searchToken(source, doc, `type=${m[1]}`) ?? searchToken(source, doc, m[1]) ?? topLine(doc)
   }
-
-  // W_QUOTED_SELECTOR: message contains the quoted selector
-  // e.g. 'Quoted selector "@a" is deprecated'
   if (code === 'W_QUOTED_SELECTOR') {
     const m = message.match(/"(@[^"]+)"/)
     if (m) return searchToken(source, doc, `"${m[1]}"`) ?? topLine(doc)
   }
-
-  // W_DEPRECATED: usually about tp_to
   if (code === 'W_DEPRECATED') {
     const m = message.match(/^(\w+) is deprecated/)
     if (m) return searchToken(source, doc, m[1]) ?? topLine(doc)
   }
-
   return topLine(doc)
 }
 
-/** Search source for a literal string, return range of first match. */
 function searchToken(
   source: string,
   doc: vscode.TextDocument,
@@ -203,37 +243,27 @@ function topLine(doc: vscode.TextDocument): vscode.Range {
   return new vscode.Range(0, 0, 0, doc.lineAt(0).text.length)
 }
 
-/**
- * Try to extract line/column from common error formats:
- *   "Error at line 5, column 12: ..."
- *   "5:12: ..."
- *   "[line 5] ..."
- */
 function extractRange(msg: string, doc: vscode.TextDocument): vscode.Range {
-  // "line N, column M"
   let m = msg.match(/line[: ]+(\d+)[,\s]+col(?:umn)?[: ]+(\d+)/i)
   if (m) {
     const l = Math.max(0, parseInt(m[1]) - 1)
     const c = Math.max(0, parseInt(m[2]) - 1)
     return new vscode.Range(l, c, l, c + 80)
   }
-  // "N:M"
   m = msg.match(/^(\d+):(\d+)/)
   if (m) {
     const l = Math.max(0, parseInt(m[1]) - 1)
     const c = Math.max(0, parseInt(m[2]) - 1)
     return new vscode.Range(l, c, l, c + 80)
   }
-  // "[line N]"
   m = msg.match(/\[line (\d+)\]/i)
   if (m) {
     const l = Math.max(0, parseInt(m[1]) - 1)
     return new vscode.Range(l, 0, l, 200)
   }
-  // Fallback: highlight first line
   return new vscode.Range(0, 0, 0, doc.lineAt(0).text.length)
 }
 
-export function deactivate(): void {
-  // nothing
+export function deactivate(): Promise<void> | undefined {
+  return lspClient?.stop()
 }

package/examples/showcase.mcrs

@@ -293,9 +293,9 @@ fn _dump_advanced_phase() {
     say("§eHash (splitmix32) & 1D Noise:");
     say(f"  hash_int(0)   = {hash_int(0)}");
     say(f"  hash_int(1)   = {hash_int(1)}");
-    say(f"  noise1d(0,42) = {noise1d(0, 42)}");
-    say(f"  noise1d(1,42) = {noise1d(1, 42)}");
-    say(f"  noise1d(2,42) = {noise1d(2, 42)}");
+    say(f"  noise1d(0,42) = {noise1d(0)}");
+    say(f"  noise1d(1,42) = {noise1d(1)}");
+    say(f"  noise1d(2,42) = {noise1d(2)}");
 
     // Modular exponentiation
     say("§eModular Exponentiation:");

package/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
-  roots: ['<rootDir>/src', '<rootDir>/src2'],
+  roots: ['<rootDir>/src'],
 };

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "redscript-mc",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A high-level programming language that compiles to Minecraft datapacks",
   "main": "dist/src/index.js",
   "bin": {
     "redscript": "dist/src/cli.js",
-    "rsc": "dist/src/cli.js"
+    "rsc": "dist/src/cli.js",
+    "redscript-lsp": "dist/src/lsp/main.js"
   },
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w",
     "test": "jest",
     "cli": "ts-node src/cli.ts",
+    "lsp": "node dist/src/lsp/main.js",
     "validate-mc": "jest src/__tests__/mc-syntax.test.ts --verbose",
     "postbuild": "node scripts/postbuild.js"
   },
@@ -35,5 +37,9 @@
     "type": "git",
     "url": "https://github.com/bkmashiro/redscript.git"
   },
-  "author": "bkmashiro"
+  "author": "bkmashiro",
+  "dependencies": {
+    "vscode-languageserver": "^9.0.1",
+    "vscode-languageserver-textdocument": "^1.0.12"
+  }
 }