Add support for [Scope] in completion and reference

src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Caching/StepsDefinitions/ScopeAttributeReader.cs

@@ -61,7 +61,7 @@ public class ScopeAttributeUtil
             }
 
             scopes ??= new List<SpecflowStepScope>(attributeInstances.Count);
-            scopes.Add(new SpecflowStepScope(feature, tag, scenario));
+            scopes.Add(new SpecflowStepScope(feature, scenario, tag));
         }
 
         return scopes;
@@ -103,7 +103,7 @@ ICollection<IMetadataCustomAttribute> attributeInstances
             }
 
             scopes ??= new List<SpecflowStepScope>(attributeInstances.Count);
-            scopes.Add(new SpecflowStepScope(feature, tag, scenario));
+            scopes.Add(new SpecflowStepScope(feature, scenario, tag));
         }
 
         return scopes;

src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/CompletionProviders/GherkinStepCompletionProvider.cs

@@ -37,6 +37,8 @@ protected override bool AddLookupItems(GherkinSpecificCodeCompletionContext cont
 
             foreach (var stepDefinitionInfo in specflowStepsDefinitionsCache.GetStepAccessibleForModule(psiModule, selectedStepKind).Concat(assemblyStepDefinitionCache.GetStepAccessibleForModule(psiModule, selectedStepKind)))
             {
+                if (!selectedStep.MatchScope(stepDefinitionInfo.Scopes))
+                    continue;
                 foreach (var stepVariation in stepPatternUtil.ExpandMatchingStepPatternWithAllPossibleParameter(stepDefinitionInfo, partialStepText, fullStepText))
                 {
                     var completionText = stepVariation;

src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/Psi/GherkinStep.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using JetBrains.Annotations;
 using JetBrains.DocumentModel;
 using JetBrains.ReSharper.Psi.ExtensionsAPI.Tree;
 using JetBrains.ReSharper.Psi.Tree;
+using ReSharperPlugin.SpecflowRiderPlugin.Caching.StepsDefinitions;
 using ReSharperPlugin.SpecflowRiderPlugin.References;
 using ReSharperPlugin.SpecflowRiderPlugin.Utils.TestOutput;
 
@@ -94,7 +96,7 @@ public string GetStepTextBeforeCaret(DocumentOffset caretLocation)
         public string GetStepText(bool withStepKeyWord = false)
         {
             var sb = new StringBuilder();
-            for (var te = (TreeElement) FirstChild; te != null; te = te.nextSibling)
+            for (var te = (TreeElement)FirstChild; te != null; te = te.nextSibling)
             {
                 switch (te)
                 {
@@ -126,7 +128,7 @@ public string GetStepTextForExample(IDictionary<string, string> exampleData)
         {
             var sb = new StringBuilder();
             var previousTokenWasAParameter = false;
-            for (var te = (TreeElement) FirstChild; te != null; te = te.nextSibling)
+            for (var te = (TreeElement)FirstChild; te != null; te = te.nextSibling)
             {
                 switch (te)
                 {
@@ -169,7 +171,7 @@ public override ReferenceCollection GetFirstClassReferences()
         public string GetFirstLineText()
         {
             var sb = new StringBuilder();
-            for (var te = (TreeElement) FirstChild; te != null; te = te.nextSibling)
+            for (var te = (TreeElement)FirstChild; te != null; te = te.nextSibling)
             {
                 if (te.GetTokenType() == GherkinTokenTypes.NEW_LINE)
                     break;
@@ -183,5 +185,50 @@ public bool Match(StepTestOutput failedStepStepsOutput)
         {
             return GetFirstLineText() == failedStepStepsOutput.FirstLine;
         }
+
+        public bool MatchScope([CanBeNull] IReadOnlyList<SpecflowStepScope> scopes)
+        {
+            if (scopes == null)
+                return true;
+
+            foreach (var scope in scopes)
+            {
+                if (scope.Scenario is not null)
+                {
+                    var matchScenario = GetScenarioText() == scope.Scenario;
+                    if (!matchScenario)
+                        continue;
+                }
+
+                if (scope.Feature is not null)
+                {
+                    var matchFeature = GetFeatureText() == scope.Feature;
+                    if (!matchFeature)
+                        continue;
+                }
+
+                if (scope.Tag is not null)
+                {
+                    var matchTag = GetEffectiveTags().Contains(scope.Tag);
+                    if (!matchTag)
+                        continue;
+                }
+
+                return true;
+            }
+            return false;
+        }
+
+        [CanBeNull]
+        public string GetFeatureText()
+        {
+            return GetContainingNode<GherkinFeature>()?.GetFeatureText();
+        }
+
+        [CanBeNull]
+        public string GetScenarioText()
+        {
+            return GetContainingNode<GherkinScenario>()?.GetScenarioText();
+        }
     }
 }

src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/References/GherkinStepElementAccessContext.cs

@@ -0,0 +1,10 @@
+using JetBrains.Annotations;
+using JetBrains.ReSharper.Psi.Resolve;
+using JetBrains.ReSharper.Psi.Tree;
+
+namespace ReSharperPlugin.SpecflowRiderPlugin.References;
+
+public class GherkinStepElementAccessContext([NotNull] ITreeNode element) : ElementAccessContext(element)
+{
+
+}

src/dotnet/ReSharperPlugin.SpecflowRiderPlugin/References/SpecflowStepDeclarationReference.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -25,6 +26,9 @@ public SpecflowStepDeclarationReference([NotNull] GherkinStep owner) : base(owne
         }
 
         public Regex RegexPattern { get; private set; }
+        public string ScenarioText { get; private set; }
+        public string FeatureText { get; private set; }
+        public IList<string> Tags { get; private set; }
 
         public override ResolveResultWithInfo ResolveWithoutCache()
         {
@@ -33,6 +37,9 @@ public override ResolveResultWithInfo ResolveWithoutCache()
             var stepKind = myOwner.EffectiveStepKind;
             var stepText = myOwner.GetStepText();
             var psiModule = myOwner.GetPsiModule();
+            ScenarioText = myOwner.GetScenarioText();
+            FeatureText = myOwner.GetFeatureText();
+            Tags = myOwner.GetEffectiveTags().ToList();
 
             var containingScenario = myOwner.GetContainingNode<IGherkinScenario>();
             if (containingScenario is GherkinScenarioOutline scenarioOutline)
@@ -45,26 +52,29 @@ public override ResolveResultWithInfo ResolveWithoutCache()
 
                 foreach (var cacheEntry in cacheEntries.Where(c => c.StepKind == stepKind))
                 {
-                     if (cacheEntry.Regex?.IsMatch(stepText) == true)
-                     {
-                         var types = psiServices.Symbols.GetTypesAndNamespacesInFile(sourceFile);
-                         foreach (var decElement in types)
-                         {
-                             if (!(decElement is IClass cl))
-                                 continue;
-
-                             var method = cl.GetMembers().OfType<IMethod>().FirstOrDefault(x => x.ShortName == cacheEntry.MethodName);
-                             if (method == null)
-                                 continue;
-
-                             var symbolInfo = new SymbolInfo(method);
-                             var resolveResult = ResolveResultFactory.CreateResolveResult(symbolInfo.GetDeclaredElement(), symbolInfo.GetSubstitution());
-
-                             RegexPattern = cacheEntry.Regex;
-                             return new ResolveResultWithInfo(resolveResult, ResolveErrorType.OK);
-                         }
-                     }
+                    if (!myOwner.MatchScope(cacheEntry.Scopes))
+                        continue;
+                    if (cacheEntry.Regex?.IsMatch(stepText) == true)
+                    {
+                        var types = psiServices.Symbols.GetTypesAndNamespacesInFile(sourceFile);
+                        foreach (var decElement in types)
+                        {
+                            if (decElement is not IClass cl)
+                                continue;
+                            if (cl.GetClrName().FullName != cacheEntry.ClassFullName)
+                                continue;
+
+                            var method = cl.GetMembers().OfType<IMethod>().FirstOrDefault(x => x.ShortName == cacheEntry.MethodName);
+                            if (method == null)
+                                continue;
+
+                            var symbolInfo = new SymbolInfo(method);
+                            var resolveResult = ResolveResultFactory.CreateResolveResult(symbolInfo.GetDeclaredElement(), symbolInfo.GetSubstitution());
 
+                            RegexPattern = cacheEntry.Regex;
+                            return new ResolveResultWithInfo(resolveResult, ResolveErrorType.OK);
+                        }
+                    }
                 }
             }
 
@@ -78,6 +88,8 @@ public override ResolveResultWithInfo ResolveWithoutCache()
 
                 foreach (var cacheEntry in cacheEntries.Where(c => c.StepKind == stepKind))
                 {
+                    if (!myOwner.MatchScope(cacheEntry.Scopes))
+                        continue;
                     if (cacheEntry.Regex?.IsMatch(stepText) == true)
                     {
                         var assemblyFile = psiAssemblyFileLoader.GetOrLoadAssembly(psiAssembly, false);