Fixed 'Bug 12101 - Refactoring namespaces single word at the time '.

3 files changed, 10 insertions, 7 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
index 6e91bff231..4fc70543c0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpReferenceFinder.cs
@@ -115,6 +115,8 @@ namespace MonoDevelop.CSharp.Refactoring
 			} else if (result is NamespaceResolveResult) {
 				var ns = ((NamespaceResolveResult)result).Namespace;
 				valid = searchedMembers.FirstOrDefault (n => n is INamespace && ns.FullName.StartsWith (((INamespace)n).FullName, StringComparison.Ordinal));
+				if (!(node is NamespaceDeclaration))
+					goto skip;
 			} else if (result is LocalResolveResult) {
 				var ns = ((LocalResolveResult)result).Variable;
 				valid = searchedMembers.FirstOrDefault (n => n is IVariable && ((IVariable)n).Region == ns.Region);
@@ -174,6 +176,8 @@ namespace MonoDevelop.CSharp.Refactoring
 				node = ((IdentifierExpression)node).IdentifierToken;
 			}
 
+		skip:
+
 			var region = new DomRegion (fileName, node.StartLocation, node.EndLocation);
 

 			var length = node is PrimitiveType ? keywordName.Length : node.EndLocation.Column - node.StartLocation.Column;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
index b985209677..c39249dc12 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
@@ -99,6 +99,8 @@ namespace MonoDevelop.Refactoring.Rename
 				this.Title = GettextCatalog.GetString ("Rename Variable");
 			} else if (options.SelectedItem is ITypeParameter) {
 				this.Title = GettextCatalog.GetString ("Rename Type Parameter");
+			}  else if (options.SelectedItem is INamespace) {
+				this.Title = GettextCatalog.GetString ("Rename namespace");
 			} else {
 				this.Title = GettextCatalog.GetString ("Rename Item");
 			}
@@ -119,6 +121,10 @@ namespace MonoDevelop.Refactoring.Rename
 				var lvar = (IVariable)options.SelectedItem;
 				entry.Text = lvar.Name;
 				//				this.fileName = lvar.Region.FileName;
+			} else if (options.SelectedItem is INamespace) {
+				var lvar = (INamespace)options.SelectedItem;
+				entry.Text = lvar.FullName;
+				//				this.fileName = lvar.Region.FileName;
 			}
 			entry.SelectRegion (0, -1);
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
index 9d46bb11af..959d554cbf 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
@@ -369,11 +369,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 			
 			Style = CompletionWidget.GtkStyle;
 			
-			if (PropertyService.Get ("HideObsoleteItems", false)) {
-				foreach (var item in completionDataList.Where (x => x.DisplayFlags.HasFlag (DisplayFlags.Obsolete)).ToList ())
-					completionDataList.Remove (item);
-			}
-			
 			//sort, sinking obsolete items to the bottoms
 			//the string comparison is ordinal as that makes it an order of magnitude faster, which 
 			//which makes completion triggering noticeably more responsive
@@ -573,8 +568,6 @@ namespace MonoDevelop.Ide.CodeCompletion
 			IEnumerable<ICompletionData> filteredOverloads;
 			if (data.HasOverloads) {
 				filteredOverloads = data.OverloadedData;
-				if (PropertyService.Get ("HideObsoleteItems", false))
-					filteredOverloads = filteredOverloads.Where (x => !x.DisplayFlags.HasFlag (DisplayFlags.Obsolete));
 			} else {
 				filteredOverloads = new ICompletionData[] { data };
 			}