Browse Source

[CodeAction] Added JoinStringAction

newNRvisualizers
Mansheng Yang 14 years ago
parent
commit
5307b168eb
  1. 1
      ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
  2. 53
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinStringAction.cs
  3. 85
      ICSharpCode.NRefactory.Tests/CSharp/CodeActions/JoinStringTests.cs
  4. 1
      ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

1
ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj

@ -253,6 +253,7 @@
<Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" /> <Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" /> <Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" /> <Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" />
<Compile Include="Refactoring\CodeActions\JoinStringAction.cs" />
<Compile Include="Refactoring\CodeActions\MergeNestedIfAction.cs" /> <Compile Include="Refactoring\CodeActions\MergeNestedIfAction.cs" />
<Compile Include="Refactoring\CodeActions\NegateRelationalExpressionAction.cs" /> <Compile Include="Refactoring\CodeActions\NegateRelationalExpressionAction.cs" />
<Compile Include="Refactoring\CodeActions\PutInsideUsingAction.cs" /> <Compile Include="Refactoring\CodeActions\PutInsideUsingAction.cs" />

53
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/JoinStringAction.cs

@ -0,0 +1,53 @@
//
// JoinStringAction.cs
//
// Author:
// Mansheng Yang <lightyang0@gmail.com>
//
// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
//
// 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.
namespace ICSharpCode.NRefactory.CSharp.Refactoring
{
[ContextAction ("Join string literal", Description = "Join string literals.")]
public class JoinStringAction : SpecializedCodeAction<BinaryOperatorExpression>
{
protected override CodeAction GetAction (RefactoringContext context, BinaryOperatorExpression node)
{
var left = node.Left as PrimitiveExpression;
var right = node.Right as PrimitiveExpression;
if (node.Operator != BinaryOperatorType.Add || left == null || right == null ||
!(left.Value is string) || !(right.Value is string) || !node.OperatorToken.Contains(context.Location))
return null;
var isLeftVerbatim = left.LiteralValue.StartsWith ("@");
var isRightVerbatime = right.LiteralValue.StartsWith ("@");
if (isLeftVerbatim != isRightVerbatime)
return null;
return new CodeAction (context.TranslateString ("Join strings"), script => {
var start = context.GetOffset (left.EndLocation) - 1;
var end = context.GetOffset (right.StartLocation) + (isLeftVerbatim ? 2 : 1);
script.RemoveText (start, end - start);
});
}
}
}

85
ICSharpCode.NRefactory.Tests/CSharp/CodeActions/JoinStringTests.cs

@ -0,0 +1,85 @@
//
// JoinStringTests.cs
//
// Author:
// Mansheng Yang <lightyang0@gmail.com>
//
// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
//
// 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.CodeActions
{
[TestFixture]
public class JoinStringTests : ContextActionTestBase
{
public void Test (string input, string output)
{
Test<JoinStringAction> (@"
class TestClass
{
string TestMethod ()
{
return " + input + @";
}
}", @"
class TestClass
{
string TestMethod ()
{
return " + output + @";
}
}");
}
[Test]
public void TestRegularString ()
{
Test ("\"a\" $+ \"a\"", "\"aa\"");
}
[Test]
public void TestVerbatimString ()
{
Test ("@\"a\" $+ @\"a\"", "@\"aa\"");
}
public void TestWrongContext (string input)
{
TestWrongContext<JoinStringAction> (@"
class TestClass
{
string TestMethod ()
{
return " + input + @";
}
}");
}
[Test]
public void TestWrongContext ()
{
TestWrongContext ("@\"a\" $+ \"a\"");
TestWrongContext ("\"a\" $+ @\"a\"");
}
}
}

1
ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@ -94,6 +94,7 @@
<Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" /> <Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" />
<Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" /> <Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" />
<Compile Include="CSharp\CodeActions\ExtractAnonymousMethodTests.cs" /> <Compile Include="CSharp\CodeActions\ExtractAnonymousMethodTests.cs" />
<Compile Include="CSharp\CodeActions\JoinStringTests.cs" />
<Compile Include="CSharp\CodeActions\MergeNestedIfTests.cs" /> <Compile Include="CSharp\CodeActions\MergeNestedIfTests.cs" />
<Compile Include="CSharp\CodeActions\NegateRelationalExpressionTests.cs" /> <Compile Include="CSharp\CodeActions\NegateRelationalExpressionTests.cs" />
<Compile Include="CSharp\CodeActions\PutInsideUsingTests.cs" /> <Compile Include="CSharp\CodeActions\PutInsideUsingTests.cs" />

Loading…
Cancel
Save