Fixed create static field/property.

icsharpcode · Mar 26, 2012 · 402e112 · 402e112
1 parent a234f8b
commit 402e112
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 7 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateFieldAction.cs
@@ -56,15 +56,22 @@ public IEnumerable<CodeAction> GetActions(RefactoringContext context)
 			if (guessedType == null) {
 				yield break;
 			}
+			var state = context.GetResolverStateBefore(identifier);
+			bool isStatic = state.CurrentMember.IsStatic;
+
 			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Field)) 
+			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Field, Modifiers.Private, isStatic)) { 
 				yield break;
+			}
 
 			yield return new CodeAction(context.TranslateString("Create field"), script => {
 				var decl = new FieldDeclaration() {
-						ReturnType = guessedType,
-						Variables = { new VariableInitializer(identifier.Identifier) }
-					};
+					ReturnType = guessedType,
+					Variables = { new VariableInitializer(identifier.Identifier) }
+				};
+				if (isStatic) {
+					decl.Modifiers |= Modifiers.Static;
+				}
 				script.InsertWithCursor(context.TranslateString("Create field"), decl, Script.InsertPosition.Before);
 			});
 

diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs
@@ -54,12 +54,12 @@ public IEnumerable<CodeAction>  GetActionsFromIdentifier(RefactoringContext cont
 				yield break;
 			}
 			var methodName = identifier.Identifier;
-			var state = context.GetResolverStateBefore(identifier);
 			var guessedType = CreateFieldAction.GuessType(context, identifier);
 			if (guessedType.Kind != TypeKind.Delegate) {
 				yield break;
 			}
 			var invocationMethod = guessedType.GetDelegateInvokeMethod();
+			var state = context.GetResolverStateBefore(identifier);
 			bool isStatic = state.CurrentMember.IsStatic;
 
 			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));

diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreatePropertyAction.cs
@@ -52,9 +52,11 @@ public IEnumerable<CodeAction> GetActions(RefactoringContext context)
 			if (guessedType == null) {
 				yield break;
 			}
-
+			var state = context.GetResolverStateBefore(identifier);
+			bool isStatic = state.CurrentMember.IsStatic;
+
 			var service = (NamingConventionService)context.GetService(typeof(NamingConventionService));
-			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Property)) { 
+			if (service != null && !service.IsValidName(identifier.Identifier, AffectedEntity.Property, Modifiers.Private, isStatic)) { 
 				yield break;
 			}
 
@@ -65,6 +67,9 @@ public IEnumerable<CodeAction> GetActions(RefactoringContext context)
 					Getter = new Accessor(),
 					Setter = new Accessor()
 				};
+				if (isStatic) {
+					decl.Modifiers |= Modifiers.Static;
+				}
 				script.InsertWithCursor(context.TranslateString("Create property"), decl, Script.InsertPosition.Before);
 			});
 		}

diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateFieldTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateFieldTests.cs
@@ -149,5 +149,33 @@ public void TestOutParamCall ()
 				"	}" + Environment.NewLine +
 				"}", result);
 		}
+
+		[Test()]
+		public void TestStaticField ()
+		{
+			string result = RunContextAction (
+				new CreateFieldAction (),
+				"using System;" + Environment.NewLine +
+					"class TestClass" + Environment.NewLine +
+					"{" + Environment.NewLine +
+					"	static void Test ()" + Environment.NewLine +
+					"	{" + Environment.NewLine +
+					"		$foo = 0x10;" + Environment.NewLine +
+					"	}" + Environment.NewLine +
+					"}"
+			);
+
+			Assert.AreEqual (
+				"using System;" + Environment.NewLine +
+				"class TestClass" + Environment.NewLine +
+				"{" + Environment.NewLine +
+				"	static int foo;" + Environment.NewLine +
+				"" + Environment.NewLine +
+				"	static void Test ()" + Environment.NewLine +
+				"	{" + Environment.NewLine +
+				"		foo = 0x10;" + Environment.NewLine +
+				"	}" + Environment.NewLine +
+				"}", result);
+		}
 	}
 }
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreatePropertyTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreatePropertyTests.cs
@@ -122,5 +122,36 @@ public void TestOutParamCall ()
 				"	}" + Environment.NewLine +
 				"}", result);
 		}
+
+		[Test()]
+		public void TestStaticProperty ()
+		{
+			string result = RunContextAction (
+				new CreatePropertyAction (),
+				"using System;" + Environment.NewLine +
+					"class TestClass" + Environment.NewLine +
+					"{" + Environment.NewLine +
+					"	static void Test ()" + Environment.NewLine +
+					"	{" + Environment.NewLine +
+					"		$Foo = 0x10;" + Environment.NewLine +
+					"	}" + Environment.NewLine +
+					"}"
+			);
+
+			Assert.AreEqual (
+				"using System;" + Environment.NewLine +
+				"class TestClass" + Environment.NewLine +
+				"{" + Environment.NewLine +
+				"	static int Foo {" + Environment.NewLine +
+				"		get;" + Environment.NewLine +
+				"		set;" + Environment.NewLine +
+				"	}" + Environment.NewLine +
+				"	static void Test ()" + Environment.NewLine +
+				"	{" + Environment.NewLine +
+				"		Foo = 0x10;" + Environment.NewLine +
+				"	}" + Environment.NewLine +
+				"}", result);
+		}
+
 	}
 }