Merge branch 'master' into combine-dictionary

Ygg01 · Dec 24, 2023 · c87bb09 · c87bb09
2 parents 506a05c + 0f1b0b3
commit c87bb09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 40 deletions.
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
diff --git a/Linguini.Bundle/FluentBundle.cs b/Linguini.Bundle/FluentBundle.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -258,10 +257,6 @@ private bool TryInsert(string funcName, ExternalFunction fluentFunction,
         {
             switch (behavior)
             {
-#if NET5_0_OR_GREATER
-                case InsertBehavior.None:
-                    return _funcList.TryAdd(funcName, fluentFunction);
-#else
                 case InsertBehavior.None:
                     if (!_funcList.ContainsKey(funcName))
                     {
@@ -270,7 +265,6 @@ private bool TryInsert(string funcName, ExternalFunction fluentFunction,
                     }
 
                     return false;
-#endif
                 case InsertBehavior.OverwriteExisting:
                     _funcList[funcName] = fluentFunction;
                     break;

diff --git a/Linguini.Shared/Util/ZeroCopyUtil.cs b/Linguini.Shared/Util/ZeroCopyUtil.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace Linguini.Shared.Util
 {
@@ -87,7 +85,7 @@ public static bool IsOneOf(this char c, char c1, char c2, char c3, char c4)
             return c == c1 || c == c2 || c == c3 || c == c4;
         }
 
-#if !NET5_0_OR_GREATER 
+#if NETSTANDARD2_1
         // Polyfill for netstandard 2.1 until dotnet backports MemoryExtension
         public static ReadOnlyMemory<char> TrimEndPolyFill(this ReadOnlyMemory<char> memory)
             => memory.Slice(0, FindLastWhitespace(memory.Span));

diff --git a/Linguini.Syntax/Parser/LinguiniParser.cs b/Linguini.Syntax/Parser/LinguiniParser.cs
@@ -1,5 +1,4 @@
-#nullable enable
-
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -21,7 +20,7 @@ public class LinguiniParser
     {
         private readonly ZeroCopyReader _reader;
         private readonly bool _enableExperimental;
-        private const string CR = "\n";
+        private const string Cr = "\n";
 
         /// <summary>
         /// Set input to <c>string</c>
@@ -609,11 +608,11 @@ private bool TryGetPattern(out Pattern? pattern, out ParseError? error)
                             ReadOnlyMemory<char> value;
                             if (textLiteral.MissingEol && textLiteral.Start == textLiteral.End)
                             {
-                                value = CR.AsMemory();
+                                value = Cr.AsMemory();
                             }
                             else if (textLiteral.MissingEol && textLiteral.Start != textLiteral.End)
                             {
-                                var str = _reader.ReadSlice(start, end) + CR;
+                                var str = _reader.ReadSlice(start, end) + Cr;
                                 value = str.AsMemory();
                             }
                             else
@@ -623,10 +622,10 @@ private bool TryGetPattern(out Pattern? pattern, out ParseError? error)
 
                             if (lastNonBlank == i)
                             {
-#if NET5_0_OR_GREATER
-                                value = value.TrimEnd();
-#else
+#if NETSTANDARD2_1
                                 value = value.TrimEndPolyFill();
+#else
+                                value = value.TrimEnd();
 #endif
                             }
 
@@ -772,21 +771,21 @@ private List<Attribute> GetAttributes()
 
         private bool TryGetAttribute([NotNullWhen(true)] out Attribute? attr)
         {
-            if (!TryGetIdentifier(out var id, out var err))
+            if (!TryGetIdentifier(out var id, out _))
             {
                 attr = default!;
                 return false;
             }
 
             _reader.SkipBlankInline();
 
-            if (!TryExpectChar('=', out err))
+            if (!TryExpectChar('=', out _))
             {
                 attr = default!;
                 return false;
             }
 
-            if (TryGetPattern(out var pattern, out err) && pattern != null)
+            if (TryGetPattern(out var pattern, out _) && pattern != null)
             {
                 attr = new Attribute(id, pattern);
                 return true;