Browse Source

Improved ExtractFieldAction for static getters and setters.

pull/32/merge
Luís Reis 13 years ago
parent
commit
94cfe777b4
  1. 2
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs
  2. 6
      ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractFieldTests.cs

2
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractFieldAction.cs

@ -60,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -60,7 +60,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
}
AstNode entityDeclarationNode = varInit.Parent;
while (!(entityDeclarationNode is EntityDeclaration)) {
while (!(entityDeclarationNode is EntityDeclaration) || (entityDeclarationNode is Accessor)) {
entityDeclarationNode = entityDeclarationNode.Parent;
}
var entity = (EntityDeclaration) entityDeclarationNode;

6
ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ExtractFieldTests.cs

@ -167,7 +167,7 @@ class TestClass @@ -167,7 +167,7 @@ class TestClass
Test<ExtractFieldAction>(@"
class TestClass
{
int X {
static int X {
get {
int $i = 0;
return i;
@ -176,8 +176,8 @@ class TestClass @@ -176,8 +176,8 @@ class TestClass
}", @"
class TestClass
{
int i;
int X {
static int i;
static int X {
get {
i = 0;
return i;

Loading…
Cancel
Save