Hidden definitions v0.1

data/resources/StringResources.resx

@@ -2841,6 +2841,9 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.LineNumberCheckBox" xml:space="preserve">
     <value>Show &amp;line numbers</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox" xml:space="preserve">
+    <value>Show &amp;hidden definitions (brackets only)</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.Markers.LineViewerStyle.FullRow" xml:space="preserve">
     <value>Full Row</value>
   </data>

src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpBracketSearcher.cs

@@ -23,15 +23,21 @@ namespace CSharpBinding
 			if (offset > 0) {
 				char c = document.GetCharAt(offset - 1);
 				int index = openingBrackets.IndexOf(c); 
-				int otherOffset = -1;
+				int otherOffset = -1; int ind = -1;
-				if (index > -1)
+				if (index > -1) {
 					otherOffset = SearchBracketForward(document, offset, openingBrackets[index], closingBrackets[index]);
+					ind = index;
+				}
 				index = closingBrackets.IndexOf(c);
-				if (index > -1)
+				if (index > -1) {
 					otherOffset = SearchBracketBackward(document, offset - 2, openingBrackets[index], closingBrackets[index]);
+					ind = index;
+				}
 				
 				if (otherOffset > -1)
-					return new BracketSearchResult(Math.Min(offset - 1, otherOffset), 1, Math.Max(offset - 1, otherOffset), 1);
+					return new BracketSearchResult(Math.Min(offset - 1, otherOffset), 1, 
+					                               Math.Max(offset - 1, otherOffset), 1,
+					                               openingBrackets[ind].ToString(), closingBrackets[ind].ToString());
 			}
 			
 			return null;

src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetBracketSearcher.cs

@@ -23,15 +23,21 @@ namespace ICSharpCode.VBNetBinding
 			if (offset > 0) {
 				char c = document.GetCharAt(offset - 1);
 				int index = openingBrackets.IndexOf(c);
-				int otherOffset = -1;
+				int otherOffset = -1; int ind = -1;
-				if (index > -1)
+				if (index > -1) {
 					otherOffset = SearchBracketForward(document, offset, openingBrackets[index], closingBrackets[index]);
+					ind = index;
+				}
 				index = closingBrackets.IndexOf(c);
-				if (index > -1)
+				if (index > -1) {
 					otherOffset = SearchBracketBackward(document, offset - 2, openingBrackets[index], closingBrackets[index]);
+					ind = index;
+				}
 				
 				if (otherOffset > -1)
-					return new BracketSearchResult(Math.Min(offset - 1, otherOffset), 1, Math.Max(offset - 1, otherOffset), 1);
+					return new BracketSearchResult(Math.Min(offset - 1, otherOffset), 1,
+					                               Math.Max(offset - 1, otherOffset), 1,
+					                               openingBrackets[ind].ToString(), closingBrackets[ind].ToString());
 				
 				int length;
 				VBStatement statement;
@@ -49,7 +55,8 @@ namespace ICSharpCode.VBNetBinding
 				}
 				
 				if (startIndex > -1 && endIndex > -1)
-					return new BracketSearchResult(startIndex, length, endIndex, statement.EndStatement.Length);
+					return new BracketSearchResult(startIndex, length, endIndex,
+					                               statement.EndStatement.Length);
 			}
 			
 			return null;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj

@@ -98,6 +98,11 @@
     <Compile Include="Src\ExpressionHighlightRenderer.cs" />
     <Compile Include="Src\CodeManipulation.cs" />
     <Compile Include="Src\CaretHighlightAdorner.cs" />
+    <Compile Include="Src\HiddenDefinition\HiddenDefinitionControl.xaml.cs">
+      <DependentUpon>HiddenDefinitionControl.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\HiddenDefinition\HiddenDefinitionRenderer.cs" />
     <Compile Include="Src\LineChangeInfo.cs" />
     <Compile Include="Src\MyersDiff\DocumentSequence.cs" />
     <Compile Include="Src\MyersDiff\Edit.cs" />
@@ -171,6 +176,7 @@
     <EmbeddedResource Include="Resources\ReverseIncrementalSearchCursor.cur" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Src\HiddenDefinition\HiddenDefinitionControl.xaml" />
     <Page Include="Src\SharpDevelopCompletionWindow.xaml">
       <DependentUpon>SharpDevelopCompletionWindow.cs</DependentUpon>
     </Page>
@@ -230,5 +236,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Src\MyersDiff" />
+    <Folder Include="Src\HiddenDefinition" />
   </ItemGroup>
 </Project>

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs

@@ -44,6 +44,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		BracketHighlightRenderer bracketRenderer;
 		CaretReferencesRenderer caretReferencesRenderer;
 		ContextActionsRenderer contextActionsRenderer;
+		HiddenDefinition.HiddenDefinitionRenderer hiddenDefinitionRenderer;
 		
 		public CodeEditorView()
 		{
@@ -52,6 +53,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			this.bracketRenderer = new BracketHighlightRenderer(this.TextArea.TextView);
 			this.caretReferencesRenderer = new CaretReferencesRenderer(this);
 			this.contextActionsRenderer = new ContextActionsRenderer(this);
+			this.hiddenDefinitionRenderer = new HiddenDefinition.HiddenDefinitionRenderer(this);
 			
 			UpdateCustomizedHighlighting();
 			
@@ -75,6 +77,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		public virtual void Dispose()
 		{
 			contextActionsRenderer.Dispose();
+			hiddenDefinitionRenderer.Dispose();
 		}
 		
 		protected override string FileName {
@@ -110,6 +113,13 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				if (this.Adapter.Language != null) {
 					var bracketSearchResult = this.Adapter.Language.BracketSearcher.SearchBracket(this.Adapter.Document, this.TextArea.Caret.Offset);
 					this.bracketRenderer.SetHighlight(bracketSearchResult);
+					
+					if (CodeEditorOptions.Instance.ShowHiddenDefinitions) {
+						this.hiddenDefinitionRenderer.BracketSearchResult = bracketSearchResult;
+						this.hiddenDefinitionRenderer.Show();
+					} else {
+						this.hiddenDefinitionRenderer.ClosePopup();
+					}
 				}
 			} else {
 				this.bracketRenderer.SetHighlight(null);

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/HiddenDefinition/HiddenDefinitionControl.xaml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UserControl
+	x:Class="ICSharpCode.AvalonEdit.AddIn.HiddenDefinition.HiddenDefinitionControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:core="http://icsharpcode.net/sharpdevelop/core" xmlns:local="clr-namespace:ICSharpCode.AvalonEdit.AddIn.Options"
+	Background="#FFFFE7">
+	<Border BorderBrush="Black"
+		BorderThickness="1"
+		Background="Transparent">
+		<StackPanel Background="Transparent">
+			<TextBlock x:Name="DefinitionTextBlock"/>
+		</StackPanel>
+	</Border>
+</UserControl>

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/HiddenDefinition/HiddenDefinitionControl.xaml.cs

@@ -0,0 +1,27 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+using ICSharpCode.AvalonEdit.AddIn.Options;
+
+namespace ICSharpCode.AvalonEdit.AddIn.HiddenDefinition
+{
+	public partial class HiddenDefinitionControl : UserControl
+	{
+		public HiddenDefinitionControl()
+		{
+			InitializeComponent();
+			DefinitionTextBlock.FontFamily = new FontFamily(CodeEditorOptions.Instance.FontFamily);
+			DefinitionTextBlock.FontSize = CodeEditorOptions.Instance.FontSize;
+		}
+		
+		public string DefinitionText {
+			get { return this.DefinitionTextBlock.Text; }
+			set { this.DefinitionTextBlock.Text = value; }
+		}
+	}
+}

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/HiddenDefinition/HiddenDefinitionRenderer.cs

@@ -0,0 +1,91 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.ComponentModel.Design;
+using System.Linq;
+using System.Windows.Controls.Primitives;
+
+using ICSharpCode.AvalonEdit.Document;
+using ICSharpCode.Core.Presentation;
+using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Gui;
+
+namespace ICSharpCode.AvalonEdit.AddIn.HiddenDefinition
+{
+	public class HiddenDefinitionRenderer : IDisposable
+	{
+		private CodeEditorView editor;
+		private ExtendedPopup popup = new ExtendedPopup();
+		private HiddenDefinitionControl control;
+		
+		public HiddenDefinitionRenderer(CodeEditorView editorView)
+		{
+			this.editor = editorView;
+			control = new HiddenDefinitionControl();
+			WorkbenchSingleton.Workbench.ActiveContentChanged += WorkbenchSingleton_Workbench_ActiveContentChanged;
+		}
+
+		public BracketSearchResult BracketSearchResult { get; set; }
+		
+		public void Dispose()
+		{
+			WorkbenchSingleton.Workbench.ActiveContentChanged -= WorkbenchSingleton_Workbench_ActiveContentChanged;
+			ClosePopup();
+			popup = null;
+		}
+		
+		public void ClosePopup()
+		{
+			if (popup.IsOpen)
+				popup.IsOpen = false;
+		}
+		
+		public void Show()
+		{
+			ClosePopup();
+			
+			if (BracketSearchResult == null || BracketSearchResult.OpeningBracket != "{") return;
+			
+			var line = GetLineText(BracketSearchResult.OpeningBracketOffset);
+			if(line == null) return;			
+			
+			control.DefinitionText = line;
+			popup.Child = control;
+			popup.HorizontalOffset = 70;
+			popup.Placement = PlacementMode.Relative;
+			popup.PlacementTarget = editor.TextArea;
+			popup.IsOpen = true;
+		}
+		
+		private string GetLineText(int offset)
+		{
+			// get folding manager
+			var container = this.editor.Adapter.GetService(typeof(IServiceContainer)) as IServiceContainer;
+			if (container == null) return null;
+			var folding = container.GetService(typeof(ParserFoldingStrategy)) as ParserFoldingStrategy;
+			if (folding == null) return null;
+			
+			// get folding
+			var f = folding.FoldingManager.GetFoldingsContaining(offset).LastOrDefault();
+			if (f == null) return null;
+			
+			// get line
+			var line = editor.Document.GetLineByOffset(f.StartOffset);
+			if (line == null || line.IsDeleted) return null;
+			
+			// check whether the line is visible
+			int off = line.Offset;
+			if (editor.TextArea.TextView.VisualLines[0].StartOffset > off) {
+				return this.editor.TextArea.TextView.Document.GetText(off, line.Length);
+			}
+			
+			return null;
+		}
+		
+		private void WorkbenchSingleton_Workbench_ActiveContentChanged(object sender, EventArgs e)
+		{
+			ClosePopup();
+		}
+	}
+}

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs

@@ -196,6 +196,19 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 			}
 		}
 		
+		bool showHiddenDefinitions = false;
+		
+		[DefaultValue(false)]
+		public bool ShowHiddenDefinitions {
+			get { return showHiddenDefinitions; }
+			set {
+				if (showHiddenDefinitions != value) {
+					showHiddenDefinitions = value;
+					OnPropertyChanged("ShowHiddenDefinitions");
+				}
+			}
+		}
+		
 		public void BindToTextEditor(TextEditor editor)
 		{
 			editor.Options = this;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml

@@ -23,6 +23,9 @@
 				<CheckBox 
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowLineNumbers}" 
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.LineNumberCheckBox}" />
+				<CheckBox 
+					IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowHiddenDefinitions}" 
+					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" />
 			</widgets:StackPanelWithSpacing>
 		</GroupBox>
 	</StackPanel>

src/Main/Base/Project/Src/Editor/IBracketSearcher.cs

@@ -40,13 +40,20 @@ namespace ICSharpCode.SharpDevelop.Editor
 
 		public int ClosingBracketLength { get; private set; }
 		
+		public string OpeningBracket { get; private set; }
+		
+		public string ClosingBracket { get; private set; }
+		
 		public BracketSearchResult(int openingBracketOffset, int openingBracketLength,
-		                           int closingBracketOffset, int closingBracketLength)
+		                           int closingBracketOffset, int closingBracketLength, 
+		                           string openingBracket = null, string closingBracket = null)
 		{
 			this.OpeningBracketOffset = openingBracketOffset;
 			this.OpeningBracketLength = openingBracketLength;
 			this.ClosingBracketOffset = closingBracketOffset;
 			this.ClosingBracketLength = closingBracketLength;
+			this.OpeningBracket 	  = openingBracket;
+			this.ClosingBracket 	  = closingBracket;
 		}
 	}
 }