fix: #92

Author: raideer

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to the "magento-toolbox" extension will be documented in thi
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [Unreleased]
+- Fixed: Issue [#92](https://github.com/magebitcom/magento-toolbox/issues/92) (Definitions and hovers dont work on element content values that are on a new line)
+
 ## [1.6.0] - 2025-04-09
 
 - Added: Event name autocomplete

src/common/xml/XmlSuggestionProvider.ts

@@ -68,6 +68,7 @@ export abstract class XmlSuggestionProvider<T> {
     }
 
     const value = attribute?.value || '';
+    const trimmedValue = value.trim();
 
     const range = attribute
       ? new Range(
@@ -78,7 +79,7 @@ export abstract class XmlSuggestionProvider<T> {
         )
       : new Range(0, 0, 0, 0);
 
-    return this.getSuggestionItems(value, range, document, element, attribute);
+    return this.getSuggestionItems(trimmedValue, range, document, element, attribute);
   }
 
   public getElementContentSuggestionProviders(
@@ -95,6 +96,7 @@ export abstract class XmlSuggestionProvider<T> {
 
     const textContents = element.textContents.length > 0 ? element.textContents[0] : null;
     const elementValue = textContents?.text ?? '';
+    const trimmedElementValue = elementValue.trim();
 
     const range = textContents
       ? new Range(
@@ -105,7 +107,7 @@ export abstract class XmlSuggestionProvider<T> {
         )
       : new Range(0, 0, 0, 0);
 
-    return this.getSuggestionItems(elementValue, range, document, element);
+    return this.getSuggestionItems(trimmedElementValue, range, document, element);
   }
 
   protected matchesConditions(

src/definition/XmlClasslikeDefinitionProvider.ts

@@ -26,7 +26,10 @@ export class XmlClasslikeDefinitionProvider implements DefinitionProvider {
       return null;
     }
 
-    const range = document.getWordRangeAtPosition(position, /("[^"]+")|(>[^<]+<)/);
+    const range = document.getWordRangeAtPosition(
+      position,
+      /((?:\\{1,2}\w+|\w+\\{1,2})(?:\w+\\{0,2})+)/
+    );
 
     if (!range) {
       return null;
@@ -41,7 +44,7 @@ export class XmlClasslikeDefinitionProvider implements DefinitionProvider {
     }
 
     // also handle constants
-    const potentialNamespace = word.replace(/["<>]/g, '').split(':').shift();
+    const potentialNamespace = word.split(':').shift()?.trim();
 
     if (!potentialNamespace) {
       return null;
@@ -57,16 +60,11 @@ export class XmlClasslikeDefinitionProvider implements DefinitionProvider {
 
     const targetPosition = await this.getClasslikeNameRange(document, classUri);
 
-    const originSelectionRange = new Range(
-      range.start.with({ character: range.start.character + 1 }),
-      range.end.with({ character: range.end.character - 1 })
-    );
-
     return [
       {
         targetUri: classUri,
         targetRange: targetPosition,
-        originSelectionRange,
+        originSelectionRange: range,
       } as LocationLink,
     ];
   }

src/hover/XmlClasslikeHoverProvider.ts

@@ -14,7 +14,10 @@ export default class XmlClasslikeHoverProvider implements HoverProvider {
       return null;
     }
 
-    const range = document.getWordRangeAtPosition(position, /("[^"]+")|(>[^<]+<)/);
+    const range = document.getWordRangeAtPosition(
+      position,
+      /((?:\\{1,2}\w+|\w+\\{1,2})(?:\w+\\{0,2})+)/
+    );
 
     if (!range) {
       return null;
@@ -28,7 +31,7 @@ export default class XmlClasslikeHoverProvider implements HoverProvider {
       return null;
     }
 
-    const potentialNamespace = word.replace(/["<>]/g, '').split(':').shift();
+    const potentialNamespace = word.split(':').shift()?.trim();
 
     if (!potentialNamespace) {
       return null;
@@ -45,11 +48,6 @@ export default class XmlClasslikeHoverProvider implements HoverProvider {
     const phpFile = await PhpDocumentParser.parseUri(document, classUri);
     const classLikeInfo = new ClasslikeInfo(phpFile);
 
-    const rangeWithoutTags = new Range(
-      range.start.with({ character: range.start.character + 1 }),
-      range.end.with({ character: range.end.character - 1 })
-    );
-
-    return new Hover(classLikeInfo.getHover(), rangeWithoutTags);
+    return new Hover(classLikeInfo.getHover(), range);
   }
 }