fix: JS: Go to Definition is broken #125

sboulema · Oct 6, 2021 · e5c3797 · e5c3797
1 parent 7421f95
commit e5c3797
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CodeNav.Shared/CodeViewUserControlTop.xaml.cs b/CodeNav.Shared/CodeViewUserControlTop.xaml.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using System.Windows.Controls;
 using CodeNav.Helpers;
 using CodeNav.Models;

diff --git a/CodeNav.Shared/Helpers/DocumentHelper.cs b/CodeNav.Shared/Helpers/DocumentHelper.cs
@@ -66,8 +66,8 @@ public static async Task ScrollToLine(LinePosition linePosition, string filePath
         {
             try
             {
-                var documentView = await VS.Documents.GetActiveDocumentViewAsync(); 
-                
+                var documentView = await VS.Documents.GetActiveDocumentViewAsync();
+
                 if (documentView?.FilePath != filePath)
                 {
                     documentView = await VS.Documents.OpenInPreviewTabAsync(filePath);

diff --git a/CodeNav.Shared/Mappers/JavaScript/BaseMapperJS.cs b/CodeNav.Shared/Mappers/JavaScript/BaseMapperJS.cs
@@ -22,7 +22,7 @@ public static T MapBase<T>(Node member, string id, ICodeViewUserControl control)
             element.Id = name;
             element.Tooltip = name;
             element.StartLine = GetLineNumber(member, member.NodeStart);
-            element.StartLinePosition = new LinePosition(GetLineNumber(member, member.NodeStart), 0);
+            element.StartLinePosition = new LinePosition(GetLineNumber(member, member.NodeStart) - 1, 0);
             element.EndLine = GetLineNumber(member, member.End);
             element.EndLinePosition = new LinePosition(GetLineNumber(member, member.End), 0);
             element.Span = new TextSpan(member.NodeStart, member.End.GetValueOrDefault() - member.NodeStart);
@@ -33,6 +33,7 @@ public static T MapBase<T>(Node member, string id, ICodeViewUserControl control)
             element.FontFamily = new FontFamily(SettingsHelper.Font.FontFamily.Name);
             element.FontStyle = FontStyleMapper.Map(SettingsHelper.Font.Style);
             element.Control = control;
+            element.FilePath = control.CodeDocumentViewModel.FilePath;
 
             return element;
         }