Mansheng Yang
14 years ago
16 changed files with 412 additions and 133 deletions
@ -0,0 +1,93 @@
@@ -0,0 +1,93 @@
|
||||
//
|
||||
// ExtractFieldAction.cs
|
||||
//
|
||||
// Author:
|
||||
// Nieve <>
|
||||
//
|
||||
// Copyright (c) 2012 Nieve
|
||||
//
|
||||
// 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; |
||||
using System.Collections.Generic; |
||||
using System.Linq; |
||||
using ICSharpCode.NRefactory.PatternMatching; |
||||
using Mono.CSharp; |
||||
|
||||
namespace ICSharpCode.NRefactory.CSharp.Refactoring |
||||
{ |
||||
[ContextAction("Extract field", Description = "Extracts a field from a local variable declaration.")] |
||||
public class ExtractFieldAction : ICodeActionProvider |
||||
{ |
||||
public IEnumerable<CodeAction> GetActions(RefactoringContext context) |
||||
{ |
||||
//TODO: implement variable assignment & ctor param
|
||||
var varInit = context.GetNode<VariableInitializer>(); |
||||
if (varInit != null) { |
||||
AstType type = varInit.GetPrevNode() as AstType; |
||||
if (type == null) yield break; |
||||
if (varInit.Parent is FieldDeclaration) yield break; |
||||
if (CannotExtractField(varInit)) yield break; |
||||
|
||||
yield return new CodeAction("Extract field", s=>{ |
||||
var name = varInit.Name; |
||||
FieldDeclaration field = new FieldDeclaration(){ |
||||
ReturnType = type.Clone(), |
||||
Variables = { new VariableInitializer(name) } |
||||
}; |
||||
AstNode nodeToRemove = RemoveDeclaration(varInit) ? varInit.Parent : type; |
||||
s.Remove(nodeToRemove, true); |
||||
s.InsertWithCursor(context.TranslateString("Extract field"),Script.InsertPosition.Before,field); |
||||
s.FormatText(varInit.Parent); |
||||
}); |
||||
} |
||||
|
||||
var idntf = context.GetNode<Identifier>(); |
||||
if (idntf == null) yield break; |
||||
var paramDec = idntf.Parent as ParameterDeclaration; |
||||
if (paramDec != null) { |
||||
var ctor = paramDec.Parent as ConstructorDeclaration; |
||||
if (ctor == null) yield break; |
||||
MemberReferenceExpression thisField = new MemberReferenceExpression(new ThisReferenceExpression(), idntf.Name, new AstType[]{}); |
||||
var assign = new AssignmentExpression(thisField, AssignmentOperatorType.Assign, new IdentifierExpression(idntf.Name)); |
||||
var statement = new ExpressionStatement(assign); |
||||
var type = (idntf.GetPrevNode() as AstType).Clone(); |
||||
FieldDeclaration field = new FieldDeclaration(){ |
||||
ReturnType = type.Clone(), |
||||
Variables = { new VariableInitializer(idntf.Name) } |
||||
}; |
||||
yield return new CodeAction("Extract field", s=>{ |
||||
s.InsertWithCursor(context.TranslateString("Extract field"),Script.InsertPosition.Before,field); |
||||
s.AddTo(ctor.Body, statement); |
||||
}); |
||||
} |
||||
} |
||||
|
||||
static bool RemoveDeclaration (VariableInitializer varInit){ |
||||
var result = varInit.Parent as VariableDeclarationStatement; |
||||
return result.Variables.First ().Initializer.IsNull; |
||||
} |
||||
|
||||
static bool CannotExtractField (VariableInitializer varInit) |
||||
{ |
||||
var result = varInit.Parent as VariableDeclarationStatement; |
||||
return result == null || result.Variables.Count != 1; |
||||
} |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,149 @@
@@ -0,0 +1,149 @@
|
||||
//
|
||||
// CreateFieldTests.cs
|
||||
//
|
||||
// Author:
|
||||
// Nieve Goor
|
||||
//
|
||||
// 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; |
||||
using NUnit.Framework; |
||||
using ICSharpCode.NRefactory.CSharp.Refactoring; |
||||
|
||||
namespace ICSharpCode.NRefactory.CSharp.CodeActions |
||||
{ |
||||
[TestFixture] |
||||
public class ExtractFieldTests : ContextActionTestBase |
||||
{ |
||||
[Test] |
||||
public void TestWrongContext1 () |
||||
{ |
||||
TestWrongContext<ExtractFieldAction> ( |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" $foo = 2;" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}" |
||||
); |
||||
} |
||||
|
||||
[Test] |
||||
public void TestWrongContext2 () |
||||
{ |
||||
TestWrongContext<ExtractFieldAction> ( |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" int foo;" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" $foo = 2;" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}" |
||||
); |
||||
} |
||||
|
||||
[Test] |
||||
public void TestLocalInitializer() |
||||
{ |
||||
string result = RunContextAction ( |
||||
new ExtractFieldAction (), |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" int $foo = 5;" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}" |
||||
); |
||||
Console.WriteLine (result); |
||||
Assert.AreEqual ( |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" int foo;" + Environment.NewLine + |
||||
"" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" foo = 5;" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}", result); |
||||
} |
||||
|
||||
[Test] |
||||
public void TestLocalDeclaration() |
||||
{ |
||||
string result = RunContextAction ( |
||||
new ExtractFieldAction (), |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" int $foo;" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}" |
||||
); |
||||
Console.WriteLine (result); |
||||
Assert.AreEqual ( |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" int foo;" + Environment.NewLine + |
||||
"" + Environment.NewLine + |
||||
" void Test ()" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}", result); |
||||
} |
||||
|
||||
[Test] |
||||
public void TestCtorParam () |
||||
{ |
||||
string result = RunContextAction ( |
||||
new ExtractFieldAction (), |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" TestClass (int $foo)" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" " + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}" |
||||
); |
||||
|
||||
Assert.AreEqual ( |
||||
"using System;" + Environment.NewLine + |
||||
"class TestClass" + Environment.NewLine + |
||||
"{" + Environment.NewLine + |
||||
" int foo;" + Environment.NewLine + |
||||
"" + Environment.NewLine + |
||||
" TestClass (int foo)" + Environment.NewLine + |
||||
" {" + Environment.NewLine + |
||||
" this.foo = foo;" + Environment.NewLine + |
||||
" " + Environment.NewLine + |
||||
" }" + Environment.NewLine + |
||||
"}", result); |
||||
} |
||||
} |
||||
} |
||||
|
||||
Loading…
Reference in new issue