@ripple-ts/language-server 0.2.199 → 0.2.201

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripple-ts/language-server",
-  "version": "0.2.199",
+  "version": "0.2.201",
   "description": "Language Server Protocol implementation for Ripple",
   "main": "index.js",
   "bin": {
@@ -14,15 +14,15 @@
     "directory": "packages/language-server"
   },
   "dependencies": {
-    "@volar/language-server": "~2.4.23",
-    "volar-service-css": "0.0.65",
-    "volar-service-typescript": "0.0.65",
+    "@volar/language-server": "~2.4.28",
+    "volar-service-css": "0.0.68",
+    "volar-service-typescript": "0.0.68",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@ripple-ts/typescript-plugin": "0.2.199"
+    "@ripple-ts/typescript-plugin": "0.2.201"
   },
   "devDependencies": {
-    "ripple": "0.2.199"
+    "ripple": "0.2.201"
   },
   "peerDependencies": {
     "typescript": "^5.9.2"

package/src/definitionPlugin.js

@@ -203,66 +203,6 @@ function createDefinitionPlugin() {
 						}
 					}
 
-					// Below here we handle adjusting TS definition for transformed tokens
-					// `originSelectionRange` returned by TS needs its end character adjusted
-					// to account for the source length differing from generated length
-					// e.g. when "component" in Ripple maps to "function" in TS
-					// Or when "#Map" maps to "TrackedMap", etc.
-
-					// If no TypeScript definitions, nothing to modify
-					// Volar will let the next ts plugin handle it
-					if (tsDefinitions.length === 0) {
-						return;
-					}
-
-					// Get the range from TypeScript's definition to find the exact token
-					// This gives us the precise start and end of the token (e.g., "function")
-					const firstDefinition = tsDefinitions[0];
-					if (!firstDefinition?.originSelectionRange) {
-						return tsDefinitions;
-					}
-
-					const range = firstDefinition.originSelectionRange;
-					const rangeStart = document.offsetAt(range.start);
-					const rangeEnd = document.offsetAt(range.end);
-
-					// Find the mapping using the exact token range for O(1) lookup
-					const mapping = virtualCode.findMappingByGeneratedRange(rangeStart, rangeEnd);
-
-					if (!mapping) {
-						return tsDefinitions;
-					}
-
-					log('Found mapping for definition at range', 'start: ', rangeStart, 'end: ', rangeEnd);
-
-					// Check if source length differs from generated length
-					// e.g., "component" -> "function" (source > generated)
-					// e.g., "#Map" -> "TrackedMap" (source < generated)
-					const customData = mapping.data.customData;
-					const sourceLength = mapping.lengths[0];
-					const generatedLength = customData.generatedLengths[0];
-
-					// If source and generated are same length, no transformation needed
-					if (sourceLength === generatedLength) {
-						return tsDefinitions;
-					}
-
-					const diffLength = sourceLength - generatedLength;
-
-					for (const definition of tsDefinitions) {
-						const tsRange = definition.originSelectionRange;
-						if (!tsRange) {
-							continue;
-						}
-
-						definition.originSelectionRange = {
-							start: tsRange.start,
-							end: {
-								line: tsRange.end.line,
-								character: tsRange.end.character + diffLength,
-							},
-						};
-					}
 					return tsDefinitions;
 				},
 			};

package/src/hoverPlugin.js

@@ -98,13 +98,26 @@ function createHoverPlugin() {
 					}
 
 					const customHover = mapping?.data?.customData?.hover;
-					if (customHover) {
+
+					if (customHover === undefined) {
+						return tsHover;
+					}
+
+					if (typeof customHover === 'function') {
+						if (tsHover) {
+							/** @type {MarkupContent} **/ (tsHover.contents).value = customHover(
+								/** @type {MarkupContent} **/ (tsHover.contents).value,
+							);
+							log('Modified hover contents using custom hover function');
+						}
+						return tsHover;
+					} else if (typeof customHover === 'string') {
 						const contents = tsHover
 							? concatMarkdownContents(
 									/** @type {MarkupContent} **/ (tsHover.contents).value,
-									customHover.contents,
+									customHover,
 								)
-							: customHover.contents;
+							: customHover;
 						log('Found custom hover data in mapping');
 						return {
 							contents: {
@@ -125,29 +138,6 @@ function createHoverPlugin() {
 
 					log('Found mapping for hover at range', 'start: ', starOffset, 'end: ', endOffset);
 
-					if (tsHover && tsHover.range) {
-						// Check if source length is greater than generated length (component -> function)
-						const customData = mapping.data.customData;
-						const sourceLength = mapping.lengths[0];
-						const generatedLength = customData.generatedLengths[0];
-
-						// If no generatedLengths, or source and generated are same length, no transformation
-						if (sourceLength <= generatedLength) {
-							return tsHover;
-						}
-
-						const diffLength = sourceLength - generatedLength;
-
-						// Adjust the hover range to highlight the full "component" keyword
-						tsHover.range = {
-							start: tsHover.range.start,
-							end: {
-								line: tsHover.range.end.line,
-								character: tsHover.range.end.character + diffLength,
-							},
-						};
-					}
-
 					return tsHover;
 				},
 			};