Formating

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OutlinePad/AstNodeHelper.cs

@@ -24,7 +24,6 @@ namespace CSharpBinding.OutlinePad
 	using System.Windows;
 	using System.Windows.Media;
 	using System.Text;
-
 	using ICSharpCode.NRefactory.CSharp;
 	using ICSharpCode.AvalonEdit.Highlighting;
 	
@@ -55,7 +54,9 @@ namespace CSharpBinding.OutlinePad
 			if (accessModifier == null && IsInterface(node.Parent)) {
 				return Modifiers.Public;
 			}
-			return accessModifier == null ? Modifiers.None : accessModifier.Modifier;
+			return accessModifier == null 
+						? Modifiers.None 
+						: accessModifier.Modifier;
         }
 		
 		private static string GetParameterDeclsAsString(AstNodeCollection<ParameterDeclaration> parameterDecls) {
@@ -96,21 +97,21 @@ namespace CSharpBinding.OutlinePad
 		
 		public static bool IsAllowedNode(AstNode node)  {
             return (IsRegionStart(node)
-					|| IsRegionEnd(node) 
+				|| IsRegionEnd(node) 
-	                || IsClass(node)
+                || IsClass(node)
-					|| IsInterface(node) 
+				|| IsInterface(node) 
-	                || IsMethod(node) 
+                || IsMethod(node) 
-	                || IsField(node) 
+                || IsField(node) 
-	                || IsProperty(node)
+                || IsProperty(node)
-					|| IsNameSpace(node)
+				|| IsNameSpace(node)
-					|| IsConstructor(node)
+				|| IsConstructor(node)
-					|| IsEvent(node)
+				|| IsEvent(node)
-					|| IsDelegate(node)
+				|| IsDelegate(node)
-					|| IsIndexer(node)
+				|| IsIndexer(node)
-					|| IsEnum(node)
+				|| IsEnum(node)
-					|| IsEnumMember(node)
+				|| IsEnumMember(node)
-					|| IsStruct(node)
+				|| IsStruct(node)
-					|| IsOperator(node)
+				|| IsOperator(node)
 			);
         }
 
@@ -120,7 +121,7 @@ namespace CSharpBinding.OutlinePad
 
 		internal static void SetRegionStartInfos(CSharpOutlineNode node, AstNode dataNode)  {
             var preProcessorNode = (PreProcessorDirective)dataNode;
-			node.ElementName = "****** " + preProcessorNode.Argument + " *****";
+			node.Name 			 = "****** " + preProcessorNode.Argument + " *****";
 			node.ForegroundBrush = (regionHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
 //			node.Weight = regionHighLighting.FontWeight != null ? regionHighLighting.FontWeight.Value : FontWeights.Normal;          
         }
@@ -131,7 +132,7 @@ namespace CSharpBinding.OutlinePad
 
 		internal static void SetRegionEndInfos(CSharpOutlineNode node, AstNode dataNode)  {
             var preProcessorNode = (PreProcessorDirective)dataNode;
-			node.ElementName = "*********************";			
+			node.Name 			 = "*********************";			
 			node.ForegroundBrush = (regionHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
 //			node.Weight = regionHighLighting.FontWeight != null ? regionHighLighting.FontWeight.Value : FontWeights.Normal;          
         }
@@ -141,8 +142,8 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetDelegateNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var typeNode = (DelegateDeclaration)dataNode;
+            var typeNode 	= (DelegateDeclaration)dataNode;
-			node.ElementName = typeNode.Name;
+			node.Name 		= typeNode.Name;
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
 //			node.Weight = classHighLighting.FontWeight != null ? classHighLighting.FontWeight.Value : FontWeights.Normal;
@@ -168,12 +169,13 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetStructNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var typeNode = (TypeDeclaration)dataNode;
+            var typeNode 	= (TypeDeclaration)dataNode;
-			node.ElementName = typeNode.Name;
+			node.Name 		= typeNode.Name;
+			node.IsExpanded = true;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = (classHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
 //			node.Weight = classHighLighting.FontWeight != null ? classHighLighting.FontWeight.Value : FontWeights.Normal;
-			node.IsExpanded = true;
 			
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -196,8 +198,9 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetEnumMemberNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var enumMemberNode = (EnumMemberDeclaration)dataNode;
+            var enumMemberNode 	= (EnumMemberDeclaration)dataNode;
-			node.ElementName = enumMemberNode.Name;
+			node.Name 			= enumMemberNode.Name;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
 			node.IconName = "Icons.16x16.Enum";			      
@@ -208,11 +211,12 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetEnumNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var typeNode = (TypeDeclaration)dataNode;
+            var typeNode 	= (TypeDeclaration)dataNode;
-			node.ElementName = typeNode.Name;
+			node.Name 		= typeNode.Name;
+			node.IsExpanded = true;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = (classHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
-			node.IsExpanded = true;
 						
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -235,15 +239,16 @@ namespace CSharpBinding.OutlinePad
         }
 
 		internal static void SetClassNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var typeNode = (TypeDeclaration)dataNode;
+            var typeNode 	= (TypeDeclaration)dataNode;
-			node.ElementName = typeNode.Name 
+			node.Name 		= typeNode.Name 
 								+ typeNode.LChevronToken 
 								+ GetTypeParameterDeclsAsString(typeNode.TypeParameters) 
 								+ typeNode.RChevronToken;
+			node.IsExpanded = true;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = (classHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
 //			node.Weight = classHighLighting.FontWeight != null ? classHighLighting.FontWeight.Value : FontWeights.Normal;
-			node.IsExpanded = true;
 						
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -266,11 +271,11 @@ namespace CSharpBinding.OutlinePad
         }
 
 		internal static void SetEventNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var eventNode = (EventDeclaration)dataNode;
+            var eventNode 		= (EventDeclaration)dataNode;
-			var varInitializer = eventNode.Children.FirstOrDefault(x => x is VariableInitializer) as VariableInitializer;
+			var varInitializer 	= eventNode.Children.FirstOrDefault(x => x is VariableInitializer) as VariableInitializer;
-			node.ElementName = (varInitializer != null) 
+			node.Name 			= (varInitializer != null) 
-									? varInitializer.Name 
+										? varInitializer.Name 
-									: "<unknown>";
+										: "<unknown>";
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
 			
@@ -292,11 +297,13 @@ namespace CSharpBinding.OutlinePad
         }
 
 		internal static void SetInterfaceNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var typeNode = (TypeDeclaration)dataNode;
+            var typeNode 	= (TypeDeclaration)dataNode;
-			node.ElementName = typeNode.Name;
+			node.Name 		= typeNode.Name;
+			node.IsExpanded = true;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = (interfaceHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
-			node.IsExpanded = true;
+			
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
 					node.IconName = "Icons.16x16.Interface";
@@ -318,18 +325,20 @@ namespace CSharpBinding.OutlinePad
         }
 
 		internal static void SetOperatorNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var operatorNode = (OperatorDeclaration)dataNode;			
+            var operatorNode 	= (OperatorDeclaration)dataNode;			
-            node.ElementName = operatorNode.OperatorToken 
+            node.Name 			= operatorNode.OperatorToken 
-								+ " " + operatorNode.OperatorTypeToken;
+								+ " " 
+            					+ operatorNode.OperatorTypeToken;
 
-			if (showExtendedInfos) {
-				node.ElementName += " " + operatorNode.LParToken
-										+ GetParameterDeclsAsString(operatorNode.Parameters)
-										+ operatorNode.RParToken;
-			}
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
             
+			if (showExtendedInfos) {
+				node.Name += " " 
+						   + operatorNode.LParToken
+						   + GetParameterDeclsAsString(operatorNode.Parameters)
+						   + operatorNode.RParToken;
+			}			
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
 					node.IconName = "Icons.16x16.Method";
@@ -348,12 +357,13 @@ namespace CSharpBinding.OutlinePad
         }
 
 		internal static void SetMethodNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
-            var methodNode = (MethodDeclaration)dataNode;			
+            var methodNode 	= (MethodDeclaration)dataNode;			
-            node.ElementName = methodNode.Name;
+            node.Name 		= methodNode.Name;
 					
-			node.ElementName += " " + methodNode.LParToken 
+			node.Name += " " 
-									+ (showExtendedInfos ? GetParameterDeclsAsString(methodNode.Parameters) : "")
+					   + methodNode.LParToken
-									+ methodNode.RParToken;
+					   + (showExtendedInfos ? GetParameterDeclsAsString(methodNode.Parameters) : "")
+					   + methodNode.RParToken;
 
 			if (colorizeNode)
 				node.ForegroundBrush = (methodHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
@@ -390,7 +400,8 @@ namespace CSharpBinding.OutlinePad
                 current++;
             }
 
-            node.ElementName = fieldName.ToString();
+            node.Name = fieldName.ToString();
+            
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
 
@@ -413,14 +424,16 @@ namespace CSharpBinding.OutlinePad
 		
 		internal static void SetPropertyNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
             var propertyNode = (PropertyDeclaration)dataNode;
-			node.ElementName = propertyNode.Name;
+			node.Name 		 = propertyNode.Name;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
+			
 			if (showExtendedInfos) {
-				node.ElementName += " " + propertyNode.LBraceToken 
+				node.Name += " " + propertyNode.LBraceToken 
-								  + " " + propertyNode.Getter.Keyword + (!string.IsNullOrEmpty(propertyNode.Getter.Keyword.ToString()) ? ";" : "")
+						   + " " + propertyNode.Getter.Keyword + (!string.IsNullOrEmpty(propertyNode.Getter.Keyword.ToString()) ? ";" : "")
-								  + " " + propertyNode.Setter.Keyword + (!string.IsNullOrEmpty(propertyNode.Setter.Keyword.ToString()) ? ";" : "")
+						   + " " + propertyNode.Setter.Keyword + (!string.IsNullOrEmpty(propertyNode.Setter.Keyword.ToString()) ? ";" : "")
-								  + " " + propertyNode.RBraceToken;
+						   + " " + propertyNode.RBraceToken;
 			}						
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -441,17 +454,20 @@ namespace CSharpBinding.OutlinePad
 		
 		internal static void SetIndexerNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
             var indexerNode = (IndexerDeclaration)dataNode;
-			node.ElementName = indexerNode.ReturnType.ToString() + " " 	+ indexerNode.ThisToken.ToString() 
+			node.Name 		= indexerNode.ReturnType.ToString() 
-																		+ indexerNode.LBracketToken
+						    + " " 
-																		+ GetParameterDeclsAsString(indexerNode.Parameters)
+						    + indexerNode.ThisToken.ToString()
-																		+ indexerNode.RBracketToken;
+						    + indexerNode.LBracketToken
+						    + GetParameterDeclsAsString(indexerNode.Parameters)
+						    + indexerNode.RBracketToken;		
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
+			
 			if (showExtendedInfos) {
-				node.ElementName += " " + indexerNode.LBraceToken 
+				node.Name += " " + indexerNode.LBraceToken 
-								  + " " + indexerNode.Getter.Keyword + (!string.IsNullOrEmpty(indexerNode.Getter.Keyword.ToString()) ? ";" : "")
+						   + " " + indexerNode.Getter.Keyword + (!string.IsNullOrEmpty(indexerNode.Getter.Keyword.ToString()) ? ";" : "")
-								  + " " + indexerNode.Setter.Keyword + (!string.IsNullOrEmpty(indexerNode.Setter.Keyword.ToString()) ? ";" : "")
+						   + " " + indexerNode.Setter.Keyword + (!string.IsNullOrEmpty(indexerNode.Setter.Keyword.ToString()) ? ";" : "")
-								  + " " + indexerNode.RBraceToken;
+						   + " " + indexerNode.RBraceToken;
 			}
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -471,10 +487,11 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetNameSpaceNodeInfos(CSharpOutlineNode node, AstNode dataNode) {            
-            var nameSpaceNode = (NamespaceDeclaration)dataNode;
+            var nameSpaceNode 	= (NamespaceDeclaration)dataNode;
-			node.ElementName = nameSpaceNode.Name;
+			node.Name 			= nameSpaceNode.Name;
-			node.IconName = "Icons.16x16.NameSpace";  
+			node.IconName 		= "Icons.16x16.NameSpace";  
-			node.IsExpanded = true;
+			node.IsExpanded 	= true;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = (nameSpaceHighLighting.Foreground as SimpleHighlightingBrush).GetBrush(null);
 //			node.Weight = nameSpaceHighLighting.FontWeight != null ? nameSpaceHighLighting.FontWeight.Value : FontWeights.Normal;		      
@@ -486,14 +503,15 @@ namespace CSharpBinding.OutlinePad
 		
 		internal static void SetConstructorNodeInfos(CSharpOutlineNode node, AstNode dataNode) {
             var constructorNode = (ConstructorDeclaration)dataNode;
-            node.ElementName = constructorNode.Name;
+            node.Name 			= constructorNode.Name;
+            
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
 
-			node.ElementName +=	" " 
+			node.Name += " " 
-								+ constructorNode.LParToken 
+					   + constructorNode.LParToken 
-								+ (showExtendedInfos ? GetParameterDeclsAsString(constructorNode.Parameters) : "")
+					   + (showExtendedInfos ? GetParameterDeclsAsString(constructorNode.Parameters) : "")
-								+ constructorNode.RParToken;
+					   + constructorNode.RParToken;
 
 			switch(GetAccessModifier(dataNode)) {
 				case Modifiers.Public:
@@ -513,10 +531,11 @@ namespace CSharpBinding.OutlinePad
         }
 		
 		internal static void SetDocumentNodeInfos(CSharpOutlineNode node, AstNode dataNode) {            
-			node.ElementName = Path.GetFileName(((SyntaxTree)dataNode).FileName);
+			node.Name 		= Path.GetFileName(((SyntaxTree)dataNode).FileName);
-			node.IconName = "C#.File.FullFile";    
+			node.IconName 	= "C#.File.FullFile";    
 			node.IsExpanded = true;  
-			node.Weight = FontWeights.Bold;
+			node.Weight 	= FontWeights.Bold;
+			
 			if (colorizeNode)
 				node.ForegroundBrush = Brushes.Black;
         }

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OutlinePad/CSharpOutlineNode.cs

@@ -25,30 +25,22 @@ using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.TreeView;
 using ICSharpCode.NRefactory.CSharp;
-using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.Core.Presentation;
 using System.Windows.Controls;
-using ICSharpCode.AvalonEdit.Folding;
 
 namespace CSharpBinding.OutlinePad
 {
 	class CSharpOutlineNode : SharpTreeNode
 	{
-		string elementName, name, iconName;
+		string name, iconName;
-		
-		public string ElementName {
-			get { return elementName; }
-			set {
-				this.elementName = value;
-				this.RaisePropertyChanged("Text");
-			}
-		}
 		
 		public string Name {
 			get { return name; }
 			set {
-				this.name = value;
+				if (this.name != value) {
-				this.RaisePropertyChanged("Text");
+					this.name = value;
+					this.RaisePropertyChanged("Text");
+				}
 			}
 		}
 				
@@ -65,14 +57,16 @@ namespace CSharpBinding.OutlinePad
 		public string IconName {
 			get { return iconName; }
 			set {
-				iconName = value;
+				if (iconName != value) {
-				this.RaisePropertyChanged("Icon");
+					iconName = value;
+					this.RaisePropertyChanged("Icon");
+				}
 			}
 		}
 		
 		public string GetSourceText() {
 			if (StartMarker.IsDeleted || EndMarker.IsDeleted)
-				return "";
+				return string.Empty;
 			
 			return Editor.Document.GetText(StartMarker.Offset, EndMarker.Offset - StartMarker.Offset);
 		}
@@ -97,7 +91,7 @@ namespace CSharpBinding.OutlinePad
 		}
 		
 		public override object Text {
-			get { return (!string.IsNullOrEmpty(Name) ? ElementName + " (" + Name + ")" : ElementName); }
+			get { return Name; }
 		}
 		
 		public override object Icon {
@@ -127,18 +121,23 @@ namespace CSharpBinding.OutlinePad
 				return weight;
 			}
 			set {
-				weight = value;
+				if (weight != value) {
-				RaisePropertyChanged("FontWeight");
+					weight = value;
+					RaisePropertyChanged("FontWeight");
+				}
 			}
 		}
+		
 		FontStyle style = FontStyles.Normal;
 		public FontStyle Style {
 			get {
 				return style;
 			}
 			set {
-				style = value;
+				if (style != value) {
-				RaisePropertyChanged("FontStyle");
+					style = value;
+					RaisePropertyChanged("FontStyle");
+				}
 			}
 		}
 		
@@ -160,6 +159,7 @@ namespace CSharpBinding.OutlinePad
 			if (cmd.CanExecute(this))
 				cmd.Execute(this);
 		}
+		
 		protected override void OnCollapsing() {
 			var cmd =  new HandleFoldingCommand();
 			if (cmd.CanExecute(this))

src/Libraries/SharpTreeView/ICSharpCode.TreeView/Themes/Generic.xaml

@@ -182,6 +182,8 @@
                         <Border Background="{TemplateBinding Background}">
                             <Default:SharpTreeNodeView Name="nodeView"
                                                        Foreground="{Binding Foreground}"
+                            						   FontWeight="{Binding Weight}"
+                            						   FontStyle="{Binding Style}"
                                                        HorizontalAlignment="Left" />
                         </Border>
                     </Border>