Use gherkinDialect supplied in document for and-keyword

Author: Jbontt

Reqnroll.VisualStudio/Editor/Services/Formatting/GherkinDocumentFormatter.cs

@@ -12,21 +12,19 @@ public void FormatGherkinDocument(DeveroomGherkinDocument gherkinDocument, Docum
         return;
 
       SetTagsAndLine(lines, gherkinDocument.Feature, string.Empty);
-      SetLinesForChildren(lines, gherkinDocument.Feature.Children, formatSettings, formatSettings.FeatureChildrenIndentLevel);
+      SetLinesForChildren(lines, gherkinDocument.Feature.Children, formatSettings, formatSettings.FeatureChildrenIndentLevel, gherkinDocument.GherkinDialect);
     }
 
     private void SetLinesForChildren(DocumentLinesEditBuffer lines, IEnumerable<IHasLocation> hasLocation,
-        GherkinFormatSettings formatSettings, int indentLevel)
+        GherkinFormatSettings formatSettings, int indentLevel, GherkinDialect gherkinDialect)
     {
-        var dialectProvider = ReqnrollGherkinDialectProvider.Get(formatSettings.Language);
-
         foreach (var featureChild in hasLocation)
         {
             SetTagsAndLine(lines, featureChild, GetIndent(formatSettings, indentLevel));
 
             if (featureChild is Rule rule)
                 SetLinesForChildren(lines, rule.Children, formatSettings,
-                    indentLevel + formatSettings.RuleChildrenIndentLevelWithinRule);
+                    indentLevel + formatSettings.RuleChildrenIndentLevelWithinRule, gherkinDialect);
 
             if (featureChild is ScenarioOutline scenarioOutline)
                 foreach (var example in scenarioOutline.Examples)
@@ -39,12 +37,12 @@ private void SetLinesForChildren(DocumentLinesEditBuffer lines, IEnumerable<IHas
                 }
 
             if (featureChild is IHasSteps hasSteps) 
-              FormatSteps(lines, formatSettings, indentLevel, hasSteps, dialectProvider);
+              FormatSteps(lines, formatSettings, indentLevel, hasSteps, gherkinDialect);
         }
     }
 
     private void FormatSteps(DocumentLinesEditBuffer lines, GherkinFormatSettings formatSettings, int indentLevel,
-      IHasSteps hasSteps, GherkinDialectProvider dialectProvider)
+      IHasSteps hasSteps, GherkinDialect gherkinDialect)
     {
       var previousKeyword = "";
 
@@ -62,7 +60,7 @@ private void FormatSteps(DocumentLinesEditBuffer lines, GherkinFormatSettings fo
         {
           if (step.Keyword == previousKeyword)
           {
-            var andKeyword = GetAndKeyword(dialectProvider);
+            var andKeyword = GetAndKeyword(gherkinDialect);
             newKeyword = $"{andKeyword}";
           }
           else
@@ -84,9 +82,9 @@ private void FormatSteps(DocumentLinesEditBuffer lines, GherkinFormatSettings fo
       }
     }
 
-    private static string GetAndKeyword(GherkinDialectProvider dialectProvider)
+    private static string GetAndKeyword(GherkinDialect gherkinDialect)
     {
-      return dialectProvider.DefaultDialect.AndStepKeywords.First(keyword => keyword != GherkinDialect.AsteriskKeyword);
+      return gherkinDialect.AndStepKeywords.First(keyword => keyword != GherkinDialect.AsteriskKeyword);
     }
 
     private void SetTagsAndLine(DocumentLinesEditBuffer lines, IHasLocation hasLocation, string indent)

Reqnroll.VisualStudio/Editor/Services/Formatting/GherkinFormatSettings.cs

@@ -23,7 +23,6 @@ public class GherkinFormatSettings
 
     public string TableCellPadding => new(' ', Configuration.TableCellPaddingSize);
 
-    public string Language { get; set; } = "en-US";
 
     public static GherkinFormatSettings Load(IEditorConfigOptionsProvider editorConfigOptionsProvider,
         IWpfTextView textView, DeveroomConfiguration configuration)
@@ -40,8 +39,7 @@ public static GherkinFormatSettings Load(IEditorConfigOptionsProvider editorConf
         var formatSettings = new GherkinFormatSettings
         {
             Indent = convertTabsToSpaces ? new string(' ', indentSize) : new string('\t', 1),
-            Configuration = gherkinFormatConfiguration,
-            Language = configuration?.DefaultFeatureLanguage ?? "en-US"
+            Configuration = gherkinFormatConfiguration
         };
 
         return formatSettings;

Reqnroll.VisualStudio/ProjectSystem/Configuration/ProjectScopeDeveroomConfigurationProvider.cs

@@ -116,9 +116,8 @@ private ConfigSource GetProjectConfigFilePath(string fileName)
         {
             var projectFolder = _projectScope.ProjectFolder;
             var fileSystem = _projectScope.IdeScope.FileSystem;
-            var assemblyPath = Path.GetDirectoryName(_projectScope.OutputAssemblyPath);
 
-            var configFilePath = fileSystem.GetFilePathIfExists(Path.Combine(assemblyPath ?? projectFolder, fileName));
+            var configFilePath = fileSystem.GetFilePathIfExists(Path.Combine(projectFolder, fileName));
 
             if (fileName.Equals(SpecFlowAppConfigFileName)) configFilePath ??= GetAppConfigPathFromProject();
             if (configFilePath == null)

Tests/Reqnroll.VisualStudio.Specs/Features/Editor/Commands/AutoFormatDocumentCommand.feature

@@ -301,4 +301,35 @@ Scenario: Formatting of Descriptions and Comments are not changed
 		  Todo: handle negative numbers
 
 		    Given I have entered 50 into the calculator
+		"""
+
+Rule: Auto format should replace repeated keywords with "And"
+
+Scenario: Repeating keywords are replaced with "And"
+
+	Given there is a Reqnroll project scope
+	And the following feature file in the editor
+		"""
+		Feature: Addition
+
+		Scenario: Add two numbers
+		    Given I have entered 50 into the calculator
+		    Given I have entered 70 into the calculator
+			When I add them
+			When I check the result
+			Then there should be no error
+			Then the result should be 120
+		"""
+	When I invoke the "Auto Format Document" command without waiting for the tag changes
+	Then the editor should be updated to
+		"""
+		Feature: Addition
+
+		Scenario: Add two numbers
+		    Given I have entered 50 into the calculator
+		    And I have entered 70 into the calculator
+		    When I add them
+		    And I check the result
+		    Then there should be no error
+		    And the result should be 120
 		"""