Merge pull request #46 from jeffijoe/fix/url

Fix extension parsing

Author: jeffijoe

src/.idea/.idea.MessageFormat/.idea/projectSettingsUpdater.xml

@@ -1,22 +1,21 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+[DebuggerDisplay("{{RuleDescription}}")]
+public class Condition
 {
-    [DebuggerDisplay("{{RuleDescription}}")]
-    public class Condition
+    public Condition(string count, string ruleDescription, IReadOnlyList<OrCondition> orConditions)
     {
-        public Condition(string count, string ruleDescription, IReadOnlyList<OrCondition> orConditions)
-        {
-            Count = count;
-            RuleDescription = ruleDescription;
-            OrConditions = orConditions;
-        }
+        Count = count;
+        RuleDescription = ruleDescription;
+        OrConditions = orConditions;
+    }
 
-        public string Count { get; }
+    public string Count { get; }
 
-        public string RuleDescription { get; }
+    public string RuleDescription { get; }
 
-        public IReadOnlyList<OrCondition> OrConditions { get; }
-    }
-}
+    public IReadOnlyList<OrCondition> OrConditions { get; }
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/Condition.cs

@@ -1,6 +1,5 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public interface ILeftOperand
 {
-    public interface ILeftOperand
-    {
-    }
 }

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/ILeftOperand.cs

@@ -1,6 +1,5 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public interface IRightOperand
 {
-    public interface IRightOperand
-    {
-    }
 }

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/IRightOperand.cs

@@ -1,27 +1,26 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class ModuloOperand : ILeftOperand
 {
-    public class ModuloOperand : ILeftOperand
+    public ModuloOperand(OperandSymbol operandSymbol, int modValue)
     {
-        public ModuloOperand(OperandSymbol operandSymbol, int modValue)
-        {
-            Operand = operandSymbol;
-            ModValue = modValue;
-        }
+        Operand = operandSymbol;
+        ModValue = modValue;
+    }
 
-        public OperandSymbol Operand { get; }
-        public int ModValue { get; }
+    public OperandSymbol Operand { get; }
+    public int ModValue { get; }
 
-        public override bool Equals(object? obj)
-        {
-            if (obj is ModuloOperand op)
-                return op.Operand == Operand && op.ModValue == ModValue;
+    public override bool Equals(object? obj)
+    {
+        if (obj is ModuloOperand op)
+            return op.Operand == Operand && op.ModValue == ModValue;
 
-            return this == obj;
-        }
+        return this == obj;
+    }
 
-        public override int GetHashCode()
-        {
-            return Operand.GetHashCode() + ModValue.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return Operand.GetHashCode() + ModValue.GetHashCode();
     }
-}
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/LeftOperand.cs

@@ -1,25 +1,24 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class NumberOperand : IRightOperand
 {
-    public class NumberOperand : IRightOperand
+    public NumberOperand(int number)
     {
-        public NumberOperand(int number)
-        {
-            Number = number;
-        }
+        Number = number;
+    }
 
-        public int Number { get; }
+    public int Number { get; }
 
-        public override bool Equals(object? obj)
-        {
-            if (obj is NumberOperand n)
-                return n.Number == Number;
+    public override bool Equals(object? obj)
+    {
+        if (obj is NumberOperand n)
+            return n.Number == Number;
 
-            return this == obj;
-        }
+        return this == obj;
+    }
 
-        public override int GetHashCode()
-        {
-            return Number.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return Number.GetHashCode();
     }
 }

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/NumberOperand.cs

@@ -1,45 +1,44 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public enum OperandSymbol
 {
-    public enum OperandSymbol
-    {
-        /// <summary>
-        /// n - absolute value of the source number.
-        /// </summary>
-        AbsoluteValue,
-
-        /// <summary>
-        /// i - integer digits of n.
-        /// </summary>
-        IntegerDigits,
-
-        /// <summary>
-        /// v - number of visible fraction digits in n, with trailing zeros.
-        /// </summary>
-        VisibleFractionDigitNumber,
-
-        /// <summary>
-        /// w - number of visible fraction digits in n, without trailing zeros.
-        /// </summary>
-        VisibleFractionDigitNumberWithoutTrailingZeroes,
-
-        /// <summary>
-        /// f - number of visible fraction digits in n, with trailing zeros.
-        /// </summary>
-        VisibleFractionDigits,
-
-        /// <summary>
-        /// t - visible fraction digits in n, without trailing zeros.
-        /// </summary>
-        VisibleFractionDigitsWithoutTrailingZeroes,
-
-        /// <summary>
-        /// c - compact decimal exponent value: exponent of the power of 10 used in compact decimal formatting.
-        /// </summary>
-        ExponentC,
-
-        /// <summary>
-        /// e - currently, synonym for ‘c’. however, may be redefined in the future.
-        /// </summary>
-        ExponentE,
-    }
-}
+    /// <summary>
+    /// n - absolute value of the source number.
+    /// </summary>
+    AbsoluteValue,
+
+    /// <summary>
+    /// i - integer digits of n.
+    /// </summary>
+    IntegerDigits,
+
+    /// <summary>
+    /// v - number of visible fraction digits in n, with trailing zeros.
+    /// </summary>
+    VisibleFractionDigitNumber,
+
+    /// <summary>
+    /// w - number of visible fraction digits in n, without trailing zeros.
+    /// </summary>
+    VisibleFractionDigitNumberWithoutTrailingZeroes,
+
+    /// <summary>
+    /// f - number of visible fraction digits in n, with trailing zeros.
+    /// </summary>
+    VisibleFractionDigits,
+
+    /// <summary>
+    /// t - visible fraction digits in n, without trailing zeros.
+    /// </summary>
+    VisibleFractionDigitsWithoutTrailingZeroes,
+
+    /// <summary>
+    /// c - compact decimal exponent value: exponent of the power of 10 used in compact decimal formatting.
+    /// </summary>
+    ExponentC,
+
+    /// <summary>
+    /// e - currently, synonym for ‘c’. however, may be redefined in the future.
+    /// </summary>
+    ExponentE,
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/OperandSymbol.cs

@@ -1,20 +1,19 @@
 using System.Collections.Generic;
 
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class Operation
 {
-    public class Operation
+    public Operation(ILeftOperand operandLeft, Relation relation, IReadOnlyList<IRightOperand> operandRight)
     {
-        public Operation(ILeftOperand operandLeft, Relation relation, IReadOnlyList<IRightOperand> operandRight)
-        {
-            OperandLeft = operandLeft;
-            Relation = relation;
-            OperandRight = operandRight;
-        }
+        OperandLeft = operandLeft;
+        Relation = relation;
+        OperandRight = operandRight;
+    }
 
-        public ILeftOperand OperandLeft { get; }
+    public ILeftOperand OperandLeft { get; }
 
-        public Relation Relation { get; }
+    public Relation Relation { get; }
 
-        public IReadOnlyList<IRightOperand> OperandRight { get; }
-    }
-}
+    public IReadOnlyList<IRightOperand> OperandRight { get; }
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/Operation.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class OrCondition
 {
-    public class OrCondition
+    public OrCondition(IReadOnlyList<Operation> andConditions)
     {
-        public OrCondition(IReadOnlyList<Operation> andConditions)
-        {
-            AndConditions = andConditions;
-        }
-
-        public IReadOnlyList<Operation> AndConditions { get; }
+        AndConditions = andConditions;
     }
-}
+
+    public IReadOnlyList<Operation> AndConditions { get; }
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/OrCondition.cs

@@ -1,17 +1,16 @@
 using System.Collections.Generic;
 
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class PluralRule
 {
-    public class PluralRule
+    public PluralRule(string[] locales, IReadOnlyList<Condition> conditions)
     {
-        public PluralRule(string[] locales, IReadOnlyList<Condition> conditions)
-        {
-            Locales = locales;
-            Conditions = conditions;
-        }
+        Locales = locales;
+        Conditions = conditions;
+    }
 
-        public string[] Locales { get; }
+    public string[] Locales { get; }
 
-        public IReadOnlyList<Condition> Conditions { get; }
-    }
-}
+    public IReadOnlyList<Condition> Conditions { get; }
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/PluralRule.cs

@@ -1,27 +1,26 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public class RangeOperand : IRightOperand
 {
-    public class RangeOperand : IRightOperand
+    public RangeOperand(int start, int end)
     {
-        public RangeOperand(int start, int end)
-        {
-            Start = start;
-            End = end;
-        }
+        Start = start;
+        End = end;
+    }
 
-        public int Start { get; }
-        public int End { get; }
+    public int Start { get; }
+    public int End { get; }
 
-        public override bool Equals(object? obj)
-        {
-            if (obj is RangeOperand n)
-                return n.Start == Start && n.End == End;
+    public override bool Equals(object? obj)
+    {
+        if (obj is RangeOperand n)
+            return n.Start == Start && n.End == End;
 
-            return this == obj;
-        }
+        return this == obj;
+    }
 
-        public override int GetHashCode()
-        {
-            return Start.GetHashCode() + End.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return Start.GetHashCode() + End.GetHashCode();
     }
-}
+}

src/Jeffijoe.MessageFormat.MetadataGenerator/Plural/Parsing/AST/RangeOperand.cs

@@ -1,7 +1,6 @@
-namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST
+namespace Jeffijoe.MessageFormat.MetadataGenerator.Plural.Parsing.AST;
+
+public enum Relation
 {
-    public enum Relation
-    {
-        Equals, NotEquals
-    }
-}
+    Equals, NotEquals
+}