@ripple-ts/language-server 0.2.191 → 0.2.192

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripple-ts/language-server",
-  "version": "0.2.191",
+  "version": "0.2.192",
   "description": "Language Server Protocol implementation for Ripple",
   "main": "index.js",
   "bin": {
@@ -19,10 +19,10 @@
     "volar-service-typescript": "0.0.65",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@ripple-ts/typescript-plugin": "0.2.191"
+    "@ripple-ts/typescript-plugin": "0.2.192"
   },
   "devDependencies": {
-    "ripple": "0.2.191"
+    "ripple": "0.2.192"
   },
   "peerDependencies": {
     "typescript": "^5.9.2"

package/src/hoverPlugin.js

@@ -10,7 +10,7 @@ const {
 	createLogging,
 	getWordFromPosition,
 	concatMarkdownContents,
-	deobfuscateImportDefinitions,
+	deobfuscateIdentifiers,
 } = require('./utils.js');
 
 const { log, logError } = createLogging('[Ripple Hover Plugin]');
@@ -55,7 +55,7 @@ function createHoverPlugin() {
 					}
 
 					if (tsHover && tsHover.contents) {
-						/** @type {MarkupContent} **/ (tsHover.contents).value = deobfuscateImportDefinitions(
+						/** @type {MarkupContent} **/ (tsHover.contents).value = deobfuscateIdentifiers(
 							/** @type {MarkupContent} **/ (tsHover.contents).value,
 						);
 					}

package/src/typescriptDiagnosticPlugin.js

@@ -8,10 +8,19 @@
 @import {TextDocument} from 'vscode-languageserver-textdocument';
  */
 
-const { getVirtualCode, createLogging } = require('./utils.js');
+const { getVirtualCode, createLogging, deobfuscateIdentifiers } = require('./utils.js');
 
 const { log, logError } = createLogging('[Ripple TypeScript Diagnostic Plugin]');
 
+/**
+ * @param {Diagnostic} diagnostic
+ * @param {Diagnostic[]} items
+ */
+function process(diagnostic, items) {
+	diagnostic.message = deobfuscateIdentifiers(diagnostic.message);
+	items.push(diagnostic);
+}
+
 /**
  * Filter diagnostics based on suppressed diagnostic codes in mappings.
  * @param {TextDocument} document
@@ -19,7 +28,7 @@ const { log, logError } = createLogging('[Ripple TypeScript Diagnostic Plugin]')
  * @param {Diagnostic[]} diagnostics
  * @returns {Diagnostic[]}
  */
-function filterDiagnostics(document, context, diagnostics) {
+function processDiagnostics(document, context, diagnostics) {
 	if (!diagnostics || diagnostics.length === 0) {
 		return diagnostics;
 	}
@@ -32,20 +41,25 @@ function filterDiagnostics(document, context, diagnostics) {
 		return diagnostics;
 	}
 
-	const filtered = diagnostics.filter((diagnostic) => {
+	/** @type {Diagnostic[]} */
+	const result = [];
+
+	for (const diagnostic of diagnostics) {
 		const range = diagnostic.range;
 		const rangeStart = document.offsetAt(range.start);
 		const rangeEnd = document.offsetAt(range.end);
 		const mapping = virtualCode.findMappingByGeneratedRange(rangeStart, rangeEnd);
 
 		if (!mapping) {
-			return true;
+			process(diagnostic, result);
+			continue;
 		}
 
 		const suppressedCodes = mapping.data.customData?.suppressedDiagnostics;
 
 		if (!suppressedCodes || suppressedCodes.length === 0) {
-			return true;
+			process(diagnostic, result);
+			continue;
 		}
 
 		const diagnosticCode =
@@ -57,14 +71,14 @@ function filterDiagnostics(document, context, diagnostics) {
 
 		if (diagnosticCode && suppressedCodes.includes(diagnosticCode)) {
 			log(`Suppressing diagnostic ${diagnosticCode}: ${diagnostic.message}`);
-			return false;
+			continue;
 		}
 
-		return true;
-	});
+		process(diagnostic, result);
+	}
 
-	log(`Filtered from ${diagnostics.length} to ${filtered.length} diagnostics`);
-	return filtered;
+	log(`Filtered from ${diagnostics.length} to ${result.length} diagnostics`);
+	return result;
 }
 
 /**
@@ -96,7 +110,7 @@ function createTypeScriptDiagnosticFilterPlugin() {
 					// This maintains the plugin association for code actions
 					instance.provideDiagnostics = async function (document, token) {
 						const diagnostics = await originalProvider?.call(originalInstance, document, token);
-						return filterDiagnostics(document, context, diagnostics ?? []);
+						return processDiagnostics(document, context, diagnostics ?? []);
 					};
 
 					log('Successfully wrapped typescript-semantic provideDiagnostics');

package/src/utils.js

@@ -27,13 +27,13 @@ let deobfuscate_identifier;
 /** @type {IDENTIFIER_OBFUSCATION_PREFIX} */
 let IDENTIFIER_OBFUSCATION_PREFIX;
 /** @type {RegExp} */
-let obfuscatedImportRegex;
+let obfuscated_identifier_regex;
 
 import('ripple/compiler/internal/identifier/utils').then((imports) => {
 	is_identifier_obfuscated = imports.is_identifier_obfuscated;
 	deobfuscate_identifier = imports.deobfuscate_identifier;
 	IDENTIFIER_OBFUSCATION_PREFIX = imports.IDENTIFIER_OBFUSCATION_PREFIX;
-	obfuscatedImportRegex = new RegExp(
+	obfuscated_identifier_regex = new RegExp(
 		escapeRegExp(IDENTIFIER_OBFUSCATION_PREFIX) + charAllowedWordRegex.source + '+',
 		'gm',
 	);
@@ -52,8 +52,8 @@ function escapeRegExp(source) {
  * @param {string} text
  * @returns {string}
  */
-function deobfuscateImportDefinitions(text) {
-	return text.replace(obfuscatedImportRegex, (match) => deobfuscate_identifier(match));
+function deobfuscateIdentifiers(text) {
+	return text.replace(obfuscated_identifier_regex, (match) => deobfuscate_identifier(match));
 }
 
 /**
@@ -169,6 +169,6 @@ module.exports = {
 	isInsideExport,
 	createLogging,
 	concatMarkdownContents,
-	deobfuscateImportDefinitions,
+	deobfuscateIdentifiers,
 	DEBUG,
 };