zed-ets-language-server 2.3.2 → 2.3.4

package/index.js

@@ -48,12 +48,7 @@ async function main() {
   });
 
   // Set up forwarding of process.stdin to serverProcess IPC
-  // Note: We intentionally do NOT call setEncoding('utf8') here because:
-  // 1. LSP Content-Length is measured in bytes, not characters
-  // 2. TCP data can be split at arbitrary byte boundaries, including mid-multibyte UTF-8
-  // 3. If setEncoding('utf8') is used and data splits mid-character, the decoder may
-  //    produce replacement characters or corrupt the byte boundary tracking
-  // By keeping stdin as raw Buffer, data-parser.js can correctly track byte positions
+  process.stdin.setEncoding('utf8');
   process.stdin.on('data', (data) => parse(data, async (message) => {
     // This special ets request is required in document: https://github.com/ohosvscode/arkTS/tree/next/packages/language-server
     // When this goes wrong, ETS UI decorators and functions will be type of any
@@ -62,6 +57,8 @@ async function main() {
 
       const ohos = await listHelperPaths(initializationOptions.tsdk, initializationOptions.ohosSdkPath);
 
+      // Send both `ohos` and `ets` keys to stay compatible with
+      // @arkts/language-server v1.2.x (uses `ohos`) and v1.3.x+ (uses `ets`).
       const etsSpecialRequest = {
         jsonrpc: '2.0',
         id: Date.now(),
@@ -71,6 +68,7 @@ async function main() {
             tsdk: initializationOptions.tsdk,
           },
           ohos: ohos,
+          ets: ohos,
         },
       };
 
@@ -79,6 +77,7 @@ async function main() {
         tsdk: initializationOptions.tsdk,
       };
       generalInitRequest.params.initializationOptions.ohos = ohos;
+      generalInitRequest.params.initializationOptions.ets = ohos;
       
       logger.info(JSON.stringify(generalInitRequest));
       logger.info(JSON.stringify(etsSpecialRequest));

package/lib/data-parser.js

@@ -1,39 +1,38 @@
 import { logger } from './logger.js';
 
-let stdinBuffer = Buffer.alloc(0);
+let stdinBuffer = '';
 
 export function parse(data, callback) {
-  // Convert string to Buffer if necessary (happens when stdin.setEncoding('utf8') is used)
-  const dataBuffer = Buffer.isBuffer(data) ? data : Buffer.from(data, 'utf8');
-  stdinBuffer = Buffer.concat([stdinBuffer, dataBuffer]);
+  stdinBuffer += data.toString();
 
   while (true) {
-    const headerEnd = stdinBuffer.indexOf('\r\n\r\n');
-    if (headerEnd === -1) break;
-
-    const headerPart = stdinBuffer.subarray(0, headerEnd).toString('utf8');
-    const lengthMatch = headerPart.match(/Content-Length: (\d+)/);
+    // Find Content-Length header
+    const lengthMatch = stdinBuffer.match(/Content-Length: (\d+)\r\n/);
     if (!lengthMatch) break;
 
     const contentLength = Number.parseInt(lengthMatch[1]);
+    const headerEnd = stdinBuffer.indexOf('\r\n\r\n');
+
+    if (headerEnd === -1) break;
+
     const messageStart = headerEnd + 4;
     const messageEnd = messageStart + contentLength;
 
     if (stdinBuffer.length < messageEnd) break;
 
-    const messageJson = stdinBuffer.subarray(messageStart, messageEnd).toString('utf8');
-    stdinBuffer = stdinBuffer.subarray(messageEnd);
+    // Extract message
+    const messageJson = stdinBuffer.substring(messageStart, messageEnd);
+    stdinBuffer = stdinBuffer.substring(messageEnd);
 
     try {
       const message = JSON.parse(messageJson);
       callback(message);
     } catch (error) {
-      logger.error(`Error parsing message: ${error.message}`);
-      stdinBuffer = Buffer.alloc(0);
+      logger.error(`Error parsing message: ${error.message} ${error.stack} ${messageJson}`);
     }
   }
 }
 
 export function clearBuffer() {
-  stdinBuffer = Buffer.alloc(0);
+  stdinBuffer = '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zed-ets-language-server",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "ETS language server wrapper for Zed ArkTS extension.",
   "type": "module",
   "main": "index.js",