Skip to content

Commit c3bbde3

Browse files
rasyidfrasyidf
committed
Neaty Fix
1 parent 88c05fb commit c3bbde3

File tree

8 files changed

+48
-55
lines changed

8 files changed

+48
-55
lines changed

‎Localization/LanguageConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
9999

100100
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
101101
{
102-
return new object[0];
102+
return Array.Empty<object>();
103103
}
104104

105105
#endregion IMultiValueConverter Members

‎Localization/LanguageService.cs

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Rasyidf.Localization.Providers;
1+

22
using System;
33
using System.Collections.Generic;
44
using System.ComponentModel;
@@ -127,22 +127,12 @@ public static void ScanLanguagesInFolder(string path)
127127
{
128128

129129
var filepath = path + @"\" + t.Name;
130-
131-
StreamBase LanguagePackStream;
132-
133-
switch (t.Extension)
130+
StreamBase LanguagePackStream = t.Extension switch
134131
{
135-
case ".xml":
136-
LanguagePackStream = new XmlStream(filepath);
137-
break;
138-
139-
case ".json":
140-
LanguagePackStream = new JsonStream(filepath);
141-
break;
142-
default:
143-
LanguagePackStream = new NullStream();
144-
break;
145-
}
132+
".xml" => new XmlStream(filepath),
133+
".json" => new JsonStream(filepath),
134+
_ => new NullStream(),
135+
};
146136

147137
LanguagePackStream.Load();
148138
StreamBase.RegisterPacks(LanguagePackStream);
@@ -176,12 +166,12 @@ public void ChangeLanguage(LanguageItem value)
176166
///
177167
/// </summary>
178168
/// <param name="uid"></param>
179-
/// <param name="valueid"></param>
169+
/// <param name="valueId"></param>
180170
/// <param name="default"></param>
181171
/// <returns></returns>
182-
public static string GetString(string uid, string valueid, string @default = "")
172+
public static string GetString(string uid, string valueId, string @default = "")
183173
{
184-
return Current.LanguagePack.Translate(uid, valueid, @default);
174+
return Current.LanguagePack.Translate(uid, valueId, @default);
185175
}
186176

187177

‎Localization/Parsers/JsonParser.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
using System.Runtime.Serialization;
77
using System.Text;
88

9-
namespace Rasyidf.Localization.Parsers
9+
namespace Rasyidf.Localization
1010
{
1111
public static class JsonParser
1212
{
13-
static Stack<List<string>> splitArrayPool = new Stack<List<string>>();
14-
static StringBuilder stringBuilder = new StringBuilder();
13+
static readonly Stack<List<string>> splitArrayPool = new Stack<List<string>>();
14+
static readonly StringBuilder stringBuilder = new StringBuilder();
1515
static readonly Dictionary<Type, Dictionary<string, FieldInfo>> FieldInfoCache = new Dictionary<Type, Dictionary<string, FieldInfo>>();
1616
static readonly Dictionary<Type, Dictionary<string, PropertyInfo>> PropertyInfoCache = new Dictionary<Type, Dictionary<string, PropertyInfo>>();
1717

‎Localization/Providers/JsonStream.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using System.Collections.Generic;
33
using System.Diagnostics;
44
using System.IO;
5-
using Rasyidf.Localization.Parsers;
65

7-
namespace Rasyidf.Localization.Providers
6+
namespace Rasyidf.Localization
87
{
98
public class JsonStream : StreamBase
109
{
@@ -127,8 +126,10 @@ protected override void OnLoad()
127126
}
128127

129128
}
130-
131-
Packs.AddRange(temps.Values);
129+
foreach (var item in temps.Values)
130+
{
131+
Packs.Add(item);
132+
}
132133
temps.Clear();
133134
}
134135
}

‎Localization/Providers/StreamBase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.ObjectModel;
34
using System.ComponentModel;
45
using System.Diagnostics;
56
using System.Globalization;
@@ -19,7 +20,7 @@ public abstract class StreamBase
1920
/// <summary>
2021
/// Language Packages
2122
/// </summary>
22-
public List<LanguageItem> Packs { get; set; }
23+
public Collection<LanguageItem> Packs { get; set; }
2324

2425
/// <summary>
2526
///
@@ -31,7 +32,7 @@ public abstract class StreamBase
3132
/// </summary>
3233
public void Load()
3334
{
34-
Packs = new List<LanguageItem>();
35+
Packs = new Collection<LanguageItem>();
3536
OnLoad();
3637
IsLoaded = true;
3738
}

‎Localization/Providers/XmlStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using System.Xml;
55

6-
namespace Rasyidf.Localization.Providers
6+
namespace Rasyidf.Localization
77
{
88
public class XmlStream : StreamBase
99
{

‎Localization/Rasyidf.Localization.csproj

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
4-
<Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props')" />
5-
<Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props')" />
6-
<Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props')" />
7-
<Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
3+
<Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
4+
<Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" />
5+
<Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" />
6+
<Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" />
7+
<Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
88
<PropertyGroup>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1010
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -63,10 +63,11 @@
6363
<DefineConstants>TRACE</DefineConstants>
6464
<ErrorReport>prompt</ErrorReport>
6565
<WarningLevel>4</WarningLevel>
66-
<RunCodeAnalysis>true</RunCodeAnalysis>
66+
<RunCodeAnalysis>false</RunCodeAnalysis>
6767
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6868
<Prefer32Bit>false</Prefer32Bit>
6969
<LangVersion>preview</LangVersion>
70+
<CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
7071
</PropertyGroup>
7172
<PropertyGroup>
7273
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -109,26 +110,26 @@
109110
<None Include="packages.config" />
110111
</ItemGroup>
111112
<ItemGroup>
112-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.VersionCheckAnalyzer.resources.dll" />
113-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\analyzers\dotnet\Microsoft.CodeAnalysis.VersionCheckAnalyzer.dll" />
114-
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Humanizer.dll" />
115-
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
116-
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
117-
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
118-
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
119-
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
120-
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
113+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\analyzers\dotnet\cs\Microsoft.CodeAnalysis.VersionCheckAnalyzer.resources.dll" />
114+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\analyzers\dotnet\Microsoft.CodeAnalysis.VersionCheckAnalyzer.dll" />
115+
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Humanizer.dll" />
116+
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
117+
<Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
118+
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
119+
<Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
120+
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
121+
<Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.8\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
121122
</ItemGroup>
122123
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
123124
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124125
<PropertyGroup>
125126
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
126127
</PropertyGroup>
127-
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />
128-
<Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props'))" />
129-
<Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props'))" />
130-
<Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props'))" />
131-
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
128+
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.8\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />
129+
<Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.8\build\Microsoft.CodeQuality.Analyzers.props'))" />
130+
<Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
131+
<Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
132+
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
132133
</Target>
133134
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
134135
Other similar extension points exist, see Microsoft.Common.targets.

‎Localization/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.6" targetFramework="net461" developmentDependency="true" />
4-
<package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.6" targetFramework="net461" developmentDependency="true" />
5-
<package id="Microsoft.CodeQuality.Analyzers" version="2.9.6" targetFramework="net461" developmentDependency="true" />
6-
<package id="Microsoft.NetCore.Analyzers" version="2.9.6" targetFramework="net461" developmentDependency="true" />
7-
<package id="Microsoft.NetFramework.Analyzers" version="2.9.6" targetFramework="net461" developmentDependency="true" />
3+
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.8" targetFramework="net461" developmentDependency="true" />
4+
<package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.8" targetFramework="net461" developmentDependency="true" />
5+
<package id="Microsoft.CodeQuality.Analyzers" version="2.9.8" targetFramework="net461" developmentDependency="true" />
6+
<package id="Microsoft.NetCore.Analyzers" version="2.9.8" targetFramework="net461" developmentDependency="true" />
7+
<package id="Microsoft.NetFramework.Analyzers" version="2.9.8" targetFramework="net461" developmentDependency="true" />
88
</packages>

0 commit comments

Comments
 (0)