Browse Source
https://bugzilla.xamarin.com/show_bug.cgi?id=11855 This will notify user to use after ifs, whiles and fors not colons, but blocks.pull/32/merge
4 changed files with 186 additions and 0 deletions
@ -0,0 +1,105 @@
@@ -0,0 +1,105 @@
|
||||
//
|
||||
// Issue.cs
|
||||
//
|
||||
// Author:
|
||||
// Ciprian Khlud <ciprian.mustiata@yahoo.com>
|
||||
//
|
||||
// Copyright (c) 2013 Ciprian Khlud
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
|
||||
using System.Collections.Generic; |
||||
|
||||
namespace ICSharpCode.NRefactory.CSharp.Refactoring |
||||
{ |
||||
|
||||
[IssueDescription ("';' should be avoided", |
||||
Description = "';' should be avoided. Use '{}' instead", |
||||
Category = IssueCategories.CodeQualityIssues, |
||||
Severity = Severity.Warning, |
||||
IssueMarker = IssueMarker.Underline)] |
||||
public class UseBlockInsteadColonIssue : ICodeIssueProvider |
||||
{ |
||||
public IEnumerable<CodeIssue> GetIssues (BaseRefactoringContext context) |
||||
{ |
||||
return new GatherVisitor (context).GetIssues (); |
||||
} |
||||
|
||||
class GatherVisitor : GatherVisitorBase<IdenticalConditionalBranchIssue> |
||||
{ |
||||
private readonly string _commandTitle; |
||||
|
||||
public GatherVisitor (BaseRefactoringContext ctx) |
||||
: base (ctx) |
||||
{ |
||||
_commandTitle = ctx.TranslateString("';' should be avoided. Use '{}' instead"); |
||||
} |
||||
|
||||
public override void VisitWhileStatement(WhileStatement whileStatement) |
||||
{ |
||||
base.VisitWhileStatement(whileStatement); |
||||
var statement = whileStatement.EmbeddedStatement as EmptyStatement; |
||||
if (statement == null) |
||||
return; |
||||
|
||||
AddIssue(whileStatement.EmbeddedStatement, |
||||
_commandTitle, |
||||
script => script.Replace(whileStatement.EmbeddedStatement, new BlockStatement())); |
||||
|
||||
} |
||||
|
||||
public override void VisitForeachStatement(ForeachStatement foreachStatement) |
||||
{ |
||||
base.VisitForeachStatement(foreachStatement); |
||||
var statement = foreachStatement.EmbeddedStatement as EmptyStatement; |
||||
if (statement == null) |
||||
return; |
||||
|
||||
AddIssue(foreachStatement.EmbeddedStatement, |
||||
_commandTitle, |
||||
script => script.Replace(foreachStatement.EmbeddedStatement, new BlockStatement())); |
||||
} |
||||
|
||||
public override void VisitIfElseStatement(IfElseStatement ifElseStatement) |
||||
{ |
||||
base.VisitIfElseStatement(ifElseStatement); |
||||
var statement = ifElseStatement.TrueStatement as EmptyStatement; |
||||
if(statement==null) |
||||
return; |
||||
AddIssue(ifElseStatement.TrueStatement, |
||||
_commandTitle, |
||||
script => script.Replace(ifElseStatement.TrueStatement, new BlockStatement())); |
||||
} |
||||
|
||||
public override void VisitForStatement(ForStatement forStatement) |
||||
{ |
||||
base.VisitForStatement(forStatement); |
||||
|
||||
var statement = forStatement.EmbeddedStatement as EmptyStatement; |
||||
if (statement == null) |
||||
return; |
||||
|
||||
AddIssue(forStatement.EmbeddedStatement, |
||||
_commandTitle, |
||||
script => script.Replace(forStatement.EmbeddedStatement, new BlockStatement())); |
||||
} |
||||
} |
||||
} |
||||
|
||||
} |
@ -0,0 +1,79 @@
@@ -0,0 +1,79 @@
|
||||
//
|
||||
// UseBlockInsteadColonIssueTests.cs
|
||||
//
|
||||
// Author:
|
||||
// Ciprian Khlud <ciprian.mustiata@yahoo.com>
|
||||
//
|
||||
// Copyright (c) 2013 Ciprian Khlud
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
|
||||
using ICSharpCode.NRefactory.CSharp.Refactoring; |
||||
using NUnit.Framework; |
||||
|
||||
namespace ICSharpCode.NRefactory.CSharp.CodeIssues |
||||
{ |
||||
[TestFixture] |
||||
public class UseBlockInsteadColonIssueTests : InspectionActionTestBase |
||||
{ |
||||
[Test] |
||||
public void TestSimple () |
||||
{ |
||||
var input = @"
|
||||
class TestClass |
||||
{ |
||||
void TestMethod (int i) |
||||
{ |
||||
if(i > 0); |
||||
} |
||||
}";
|
||||
var output = @"
|
||||
class TestClass |
||||
{ |
||||
void TestMethod (int i) |
||||
{ |
||||
if(i > 0){} |
||||
} |
||||
}";
|
||||
Test<UseBlockInsteadColonIssue>(input, output); |
||||
} |
||||
[Test] |
||||
public void TestForeach() |
||||
{ |
||||
var input = @"
|
||||
class TestClass |
||||
{ |
||||
void TestMethod (int[] list) |
||||
{ |
||||
foreach(var i in list); |
||||
} |
||||
}";
|
||||
var output = @"
|
||||
class TestClass |
||||
{ |
||||
void TestMethod (int[] list) |
||||
{ |
||||
foreach(var i in list){} |
||||
} |
||||
}";
|
||||
Test<UseBlockInsteadColonIssue>(input, output); |
||||
} |
||||
} |
||||
|
||||
} |
Loading…
Reference in new issue