Separate AddInTree paths for context menus of different symbol types with inclusion of EntityContextMenu, where sensible.

src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin

@@ -157,6 +157,11 @@
 		          class = "ICSharpCode.AvalonEdit.AddIn.ContextActions.FindBaseClasses"/>
 	</Path>
 	
+	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/TypeContextMenu">
+		<Include id="FindDerivedOrOverridesClasses" item="/SharpDevelop/Workbench/MainMenu/Search/FindDerivedOrOverridesClasses" />
+		<Include id="FindBaseClasses" item="/SharpDevelop/Workbench/MainMenu/Search/FindBaseClasses" />
+	</Path>
+	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
 		<OptionPanel id = "CodeTemplates"
 		             label = "${res:Dialog.Options.CodeTemplatesText}"

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -2025,27 +2025,34 @@
 		<Include id = "Common" path = "/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Common"/>
 	</Path>-->
 	
+	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/MemberContextMenu">
+		<Include id = "Rename" item="/SharpDevelop/Workbench/MainMenu/Search/Rename" />
+	</Path>
+	
+	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/TypeContextMenu">
+		<Include id = "Rename" item="/SharpDevelop/Workbench/MainMenu/Search/Rename" />
+	</Path>
+	
+	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu/LocalContextMenu">
+		<Include id = "Rename" item="/SharpDevelop/Workbench/MainMenu/Search/Rename" />
+	</Path>
+	
 	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu">
-		<Condition name="SymbolTypeAtCaret" type="member,type,local" action="Exclude">
-			<MenuItem id = "GotoDefinition"
-			          label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
-			          shortcut = "Control|Return"
-			          icon="Icons.16x16.SelectionArrow"
-			          class = "ICSharpCode.SharpDevelop.Editor.Commands.GoToDefinition"/>
-			
-			<MenuItem id = "FindReferences"
-			          label = "${res:SharpDevelop.Refactoring.FindReferences}"
-			          shortcut = "F12"
-			          icon="Icons.16x16.SelectionArrow"
-			          class = "ICSharpCode.SharpDevelop.Editor.Commands.FindReferencesCommand"/>
-			
-			<MenuItem id = "Rename"
-			          label = "${res:SharpDevelop.Refactoring.RenameCommand}"
-			          shortcut="Ctrl+R"
-			          class = "ICSharpCode.SharpDevelop.Editor.Commands.RenameSymbolCommand"/>
-			
-			<MenuItem id = "Separator2" type = "Separator" />
+		<Condition name="SymbolTypeAtCaret" type="member" action="Exclude">
+			<Include id = "MemberContextMenu" path="/SharpDevelop/ViewContent/TextEditor/ContextMenu/MemberContextMenu" />
+			<Include id = "EntityContextMenu" path="/SharpDevelop/EntityContextMenu" />
+			<MenuItem id = "Separator1" type = "Separator" />
+		</Condition>
+		<Condition name="SymbolTypeAtCaret" type="type" action="Exclude">
+			<Include id = "TypeContextMenu" path="/SharpDevelop/ViewContent/TextEditor/ContextMenu/TypeContextMenu" />
+			<Include id = "EntityContextMenu" path="/SharpDevelop/EntityContextMenu" />
+			<MenuItem id = "Separator1" type = "Separator" />
 		</Condition>
+		<Condition name="SymbolTypeAtCaret" type="local" action="Exclude">
+			<Include id = "LocalContextMenu" path="/SharpDevelop/ViewContent/TextEditor/ContextMenu/LocalContextMenu" />
+			<MenuItem id = "Separator1" type = "Separator" />
+		</Condition>
+		
 		<Include id = "Cut" item = "/SharpDevelop/Workbench/MainMenu/Edit/Cut"/>
 		<Include id = "Copy" item = "/SharpDevelop/Workbench/MainMenu/Edit/Copy"/>
 		<Include id = "Paste" item = "/SharpDevelop/Workbench/MainMenu/Edit/Paste"/>