ReqnrollGherkinDialectProvider: Avoid NoSuchLanguageException

reqnroll · Nov 27, 2024 · 65969ec · 65969ec
1 parent eef7876
commit 65969ec
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/Reqnroll/Parser/ReqnrollGherkinDialectProvider.cs b/Reqnroll/Parser/ReqnrollGherkinDialectProvider.cs
@@ -13,16 +13,13 @@ public override GherkinDialect GetDialect(string language, Location location)
         {
             if (language.Contains("-"))
             {
-                try
-                {
-                    return base.GetDialect(language, location);
-                }
-                catch (NoSuchLanguageException)
-                {
-                    var languageBase = language.Split('-')[0];
-                    var languageBaseDialect = base.GetDialect(languageBase, location);
-                    return new GherkinDialect(language, languageBaseDialect.FeatureKeywords, languageBaseDialect.RuleKeywords, languageBaseDialect.BackgroundKeywords, languageBaseDialect.ScenarioKeywords, languageBaseDialect.ScenarioOutlineKeywords, languageBaseDialect.ExamplesKeywords, languageBaseDialect.GivenStepKeywords, languageBaseDialect.WhenStepKeywords, languageBaseDialect.ThenStepKeywords, languageBaseDialect.AndStepKeywords, languageBaseDialect.ButStepKeywords);
-                }
+                // Use TryGetDialect to avoid NoSuchLanguageException, if culture specific language is not present
+                if (TryGetDialect(language, location, out var dialect))
+                    return dialect;
+
+                var languageBase = language.Split('-')[0];
+                var languageBaseDialect = base.GetDialect(languageBase, location);
+                return new GherkinDialect(language, languageBaseDialect.FeatureKeywords, languageBaseDialect.RuleKeywords, languageBaseDialect.BackgroundKeywords, languageBaseDialect.ScenarioKeywords, languageBaseDialect.ScenarioOutlineKeywords, languageBaseDialect.ExamplesKeywords, languageBaseDialect.GivenStepKeywords, languageBaseDialect.WhenStepKeywords, languageBaseDialect.ThenStepKeywords, languageBaseDialect.AndStepKeywords, languageBaseDialect.ButStepKeywords);
             }
 
             return base.GetDialect(language, location);