Fix path construction (#43)

olsh · Nov 5, 2022 · 37b0c5e · 37b0c5e
1 parent 17cf0d2
commit 37b0c5e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -24,6 +24,7 @@
             "AppVeyor",
             "AzurePipelines",
             "Bamboo",
+            "Bitbucket",
             "Bitrise",
             "GitHubActions",
             "GitLab",

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkVersion>2022.2.0</SdkVersion>
+    <SdkVersion>2022.2.3</SdkVersion>
   </PropertyGroup>
   <!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
   <PropertyGroup>

diff --git a/src/Resharper.ConfigurationSense/Extensions/JPropertyExtensions.cs b/src/Resharper.ConfigurationSense/Extensions/JPropertyExtensions.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+
+using Newtonsoft.Json.Linq;
+
+namespace Resharper.ConfigurationSense.Extensions
+{
+    public static class JPropertyExtensions
+    {
+        public static string GetSettingsPath(this JProperty property)
+        {
+            if (property.Parent == null)
+            {
+                return string.Empty;
+            }
+
+            var positions = new List<string>();
+            JToken previous = null;
+            for (JToken current = property; current != null; current = current.Parent)
+            {
+                switch (current.Type)
+                {
+                    case JTokenType.Property:
+                        var prop = (JProperty)current;
+                        positions.Add(prop.Name);
+                        break;
+                    case JTokenType.Array:
+                    case JTokenType.Constructor:
+                        if (previous != null)
+                        {
+                            int index = ((IList<JToken>)current).IndexOf(previous);
+
+                            positions.Add(index.ToString());
+                        }
+                        break;
+                }
+
+                previous = current;
+            }
+
+            positions.Reverse();
+
+            return string.Join(":", positions);
+        }
+    }
+}
diff --git a/src/Resharper.ConfigurationSense/Extensions/ProjectExtensions.cs b/src/Resharper.ConfigurationSense/Extensions/ProjectExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -62,7 +62,7 @@ public static IEnumerable<KeyValueSetting> GetJsonProjectSettings(
                     if ((property.Value.Type != JTokenType.Object && property.Value.Type != JTokenType.Array
                              && settingType == JsonSettingType.Value) || settingType == JsonSettingType.All)
                     {
-                        formattedPath = FormatJsonPath(property);
+                        formattedPath = property.GetSettingsPath();
                     }
 
                     if (string.IsNullOrEmpty(formattedPath))
@@ -147,12 +147,6 @@ public static IEnumerable<KeyValueSetting> GetXmlProjectSettings(
             return result.Select(x => new KeyValueSetting(x.Key, string.Join(", ", x.Value)));
         }
 
-        private static string FormatJsonPath(JToken property)
-        {
-            var formattedPath = property.Path.Replace(".", ":");
-            return formattedPath;
-        }
-
         private static IEnumerable<IXmlTag> GetSettingTags(string settingsTagName, IProjectFile configFile)
         {
             var xmlFile = configFile.GetPrimaryPsiFile() as XmlFile;