h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 16:02:55 +08:00
Code Issues Releases Wiki Activity

CA2201: throw correct exception type.

Browse Source
This commit is contained in:
Huo Yaoyuan 2019-11-28 21:52:05 +08:00
parent ecfc6dfa3d
commit d7b3578cc6
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CodeAnalysis/osu.ruleset
View File

@ -57,4 +57,7 @@
<Rule Id="CA2213" Action="None" /> <Rule Id="CA2213" Action="None" />
<Rule Id="CA2235" Action="None" /> <Rule Id="CA2235" Action="None" />
</Rules> </Rules>
<Rules AnalyzerId="Microsoft.NetCore.CSharp.Analyzers" RuleNamespace="Microsoft.NetCore.CSharp.Analyzers">
<Rule Id="CA2201" Action="Warning" />
</Rules>
</RuleSet> </RuleSet>

4
osu.Game.Tests/Visual/TestSceneOsuGame.cs
View File

@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual
foreach (var type in requiredGameDependencies) foreach (var type in requiredGameDependencies)
{ {
if (game.Dependencies.Get(type) == null) if (game.Dependencies.Get(type) == null)
throw new Exception($"{type} has not been cached"); throw new InvalidOperationException($"{type} has not been cached");
} }
return true; return true;
@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual
foreach (var type in requiredGameBaseDependencies) foreach (var type in requiredGameBaseDependencies)
{ {
if (gameBase.Dependencies.Get(type) == null) if (gameBase.Dependencies.Get(type) == null)
throw new Exception($"{type} has not been cached"); throw new InvalidOperationException($"{type} has not been cached");
} }
return true; return true;

10
osu.Game/Online/API/APIRequest.cs
View File

@ -122,7 +122,7 @@ namespace osu.Game.Online.API
// attempt to decode a displayable error string. // attempt to decode a displayable error string.
var error = JsonConvert.DeserializeObject<DisplayableError>(responseString); var error = JsonConvert.DeserializeObject<DisplayableError>(responseString);
if (error != null) if (error != null)
e = new Exception(error.ErrorMessage, e); e = new APIException(error.ErrorMessage, e);
} }
catch catch
{ {
@ -154,6 +154,14 @@ namespace osu.Game.Online.API
} }
} }
public class APIException : InvalidOperationException
{
public APIException(string messsage, Exception innerException)
: base(messsage, innerException)
{
}
}
public delegate void APIFailureHandler(Exception e); public delegate void APIFailureHandler(Exception e);
public delegate void APISuccessHandler(); public delegate void APISuccessHandler();

2
osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
get get
{ {
if (i < 0 || i > Count - 1) if (i < 0 || i > Count - 1)
throw new IndexOutOfRangeException(); throw new ArgumentOutOfRangeException(nameof(i));
i += marker; i += marker;
if (i > capacity - 1) if (i > capacity - 1)