Fix tests execution

SpecFlowOSS · Mar 11, 2021 · aae5ff4 · aae5ff4
1 parent d5e3efe
commit aae5ff4
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 3 deletions.
diff --git a/...otnet/ReSharperPlugin.SpecflowRiderPlugin/Caching/StepsUsages/SpecflowStepsUsagesCache.cs b/...otnet/ReSharperPlugin.SpecflowRiderPlugin/Caching/StepsUsages/SpecflowStepsUsagesCache.cs
@@ -8,8 +8,8 @@
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.Caches;
 using JetBrains.ReSharper.Psi.Files;
-using JetBrains.RiderTutorials.Utils;
 using JetBrains.Util;
+using ReSharperPlugin.SpecflowRiderPlugin.Extensions;
 using ReSharperPlugin.SpecflowRiderPlugin.Psi;
 
 namespace ReSharperPlugin.SpecflowRiderPlugin.Caching.StepsUsages

diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Extensions/ProjectExtensions.cs b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Extensions/ProjectExtensions.cs
@@ -1,6 +1,9 @@
 using System.Linq;
 using JetBrains.Annotations;
 using JetBrains.ProjectModel;
+using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.CSharp;
+using JetBrains.ReSharper.Psi.CSharp.Tree;
 using JetBrains.ReSharper.Psi.Files;
 using JetBrains.ReSharper.Psi.Paths;
 using JetBrains.Util;
@@ -10,6 +13,13 @@ namespace ReSharperPlugin.SpecflowRiderPlugin.Extensions
 {
     public static class ProjectExtensions
     {
+        [CanBeNull]
+        public static ICSharpFile GetCSharpFile(this IProject project, string filename)
+        {
+            var sourceFileInProject = project.GetPsiSourceFileInProject(FileSystemPath.Parse(filename, FileSystemPathInternStrategy.INTERN));
+            return sourceFileInProject?.GetPsiFiles<CSharpLanguage>().SafeOfType<ICSharpFile>().SingleOrDefault<ICSharpFile>();
+        }
+
         [CanBeNull]
         public static GherkinFile GetGherkinFile(this IProject project, string filename)
         {

diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Extensions/TreeNodeExtensions.cs b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Extensions/TreeNodeExtensions.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using JetBrains.ReSharper.Psi.Tree;
+
+namespace ReSharperPlugin.SpecflowRiderPlugin.Extensions
+{
+    public static class TreeNodeExtensions
+    {
+        public static ITreeNode GetLastNodeInLine(this ITreeNode node)
+        {
+            while (node.NextSibling != null)
+                node = node.NextSibling;
+            return node;
+        }
+
+        public static IEnumerable<ITreeNode> GetChildrenInSubtrees(
+            [NotNull] this ITreeNode node)
+        {
+            if (node.FirstChild != null)
+            {
+                ITreeNode child;
+                for (child = node.FirstChild; child != null; child = child.NextSibling)
+                {
+                    yield return child;
+                    foreach (ITreeNode childrenInSubtree in child.GetChildrenInSubtrees())
+                        yield return childrenInSubtree;
+                }
+                child = (ITreeNode) null;
+            }
+        }
+
+        public static IEnumerable<T> GetChildrenInSubtrees<T>([NotNull] this ITreeNode node) where T : class, ITreeNode
+        {
+            if (node.FirstChild != null)
+            {
+                ITreeNode child;
+                for (child = node.FirstChild; child != null; child = child.NextSibling)
+                {
+                    if (child is T obj)
+                        yield return obj;
+                    foreach (T childrenInSubtree in child.GetChildrenInSubtrees<T>())
+                        yield return childrenInSubtree;
+                }
+                child = (ITreeNode) null;
+            }
+        }
+
+        public static T GetParentOfType<T>([NotNull] this ITreeNode node) where T : class, ITreeNode
+        {
+            for (; node != null; node = node.Parent)
+            {
+                if (node is T obj)
+                    return obj;
+            }
+            return default(T);
+        }
+    }
+}
diff --git a/...gin.SpecflowRiderPlugin/QuickFixes/CreateMissingStep/CreateSpecflowStepFromUsageAction.cs b/...gin.SpecflowRiderPlugin/QuickFixes/CreateMissingStep/CreateSpecflowStepFromUsageAction.cs
@@ -17,11 +17,11 @@
 using JetBrains.ReSharper.Psi.Naming.Settings;
 using JetBrains.ReSharper.Psi.Resources;
 using JetBrains.ReSharper.Psi.Transactions;
-using JetBrains.RiderTutorials.Utils;
 using JetBrains.TextControl;
 using JetBrains.UI.RichText;
 using JetBrains.Util;
 using ReSharperPlugin.SpecflowRiderPlugin.Caching.StepsDefinitions;
+using ReSharperPlugin.SpecflowRiderPlugin.Extensions;
 using ReSharperPlugin.SpecflowRiderPlugin.Helpers;
 using ReSharperPlugin.SpecflowRiderPlugin.Psi;
 using ReSharperPlugin.SpecflowRiderPlugin.References;

diff --git a/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Searchers/SpecflowStepReferenceSearcher.cs b/src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Searchers/SpecflowStepReferenceSearcher.cs
@@ -6,7 +6,7 @@
 using JetBrains.ReSharper.Psi.Resolve;
 using JetBrains.ReSharper.Psi.Search;
 using JetBrains.ReSharper.Psi.Tree;
-using JetBrains.RiderTutorials.Utils;
+using ReSharperPlugin.SpecflowRiderPlugin.Extensions;
 using ReSharperPlugin.SpecflowRiderPlugin.Psi;
 
 namespace ReSharperPlugin.SpecflowRiderPlugin.Searchers