Merge branch 'master' of github.com:icsharpcode/SharpDevelop

Author: PeterForstmeier

data/resources/StringResources.resx

@@ -1729,6 +1729,9 @@ Examples: "120", "MainClass", "Main.cs, 120".</value>
   <data name="Dialog.HighlightingEditor.ColorDlg.Italic" xml:space="preserve">
     <value>Italic</value>
   </data>
+  <data name="Dialog.HighlightingEditor.ColorDlg.Underline" xml:space="preserve">
+    <value>Underlined</value>
+  </data>
   <data name="Dialog.HighlightingEditor.Export" xml:space="preserve">
     <value>Export highlighting colors</value>
   </data>

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@@ -78,6 +78,7 @@
     <Compile Include="Src\Completion\CSharpCompletionContext.cs" />
     <Compile Include="Src\Completion\CSharpInsightItem.cs" />
     <Compile Include="Src\Completion\CSharpMethodInsight.cs" />
+    <Compile Include="Src\Completion\EnumMemberCompletionData.cs" />
     <Compile Include="Src\Completion\EventCreationCompletionData.cs" />
     <Compile Include="Src\Completion\FormatItemCompletionData.cs" />
     <Compile Include="Src\Completion\ImportCompletionData.cs" />

src/AddIns/BackendBindings/CSharpBinding/Project/Resources/CSharp-Semantic.xshd

@@ -32,7 +32,11 @@
 
 	<!-- Colors used for semantic highlighting -->
 	<Color name="ReferenceTypes" foreground="#004085" exampleText="System.#{#Uri#}# uri;"/>
+	<Color name="InterfaceTypes" foreground="#004085" exampleText="System.#{#IDisposable#}# obj;"/>
+	<Color name="TypeParameters" foreground="#004085" exampleText="class MyList&lt;#{#T#}#&gt; { }"/>
+	<Color name="DelegateTypes" foreground="#004085" exampleText="System.#{#Action#}#; action;"/>
 	<Color name="ValueTypes" fontWeight="bold" foreground="#004085" exampleText="System.#{#DateTime#}# date;"/>
+	<Color name="EnumTypes" fontWeight="bold" foreground="#004085" exampleText="System.#{#ConsoleKey#}# key;"/>
 	<Color name="MethodCall" foreground="MidnightBlue" fontWeight="bold" exampleText="o.#{#ToString#}#();"/>
 	<Color name="FieldAccess" fontStyle="italic" exampleText="return this.#{#name#}#;"/>
 	<Color name="InactiveCode" foreground="Gray" exampleText="#{#Deactivated by #if#}#"/>

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

@@ -58,10 +58,10 @@ public CSharpSemanticHighlighterVisitor(CSharpSemanticHighlighter highlighter, I
 			//this.defaultTextColor = ???;
 			this.referenceTypeColor = highlighting.GetNamedColor("ReferenceTypes");
 			this.valueTypeColor = highlighting.GetNamedColor("ValueTypes");
-			this.interfaceTypeColor = this.referenceTypeColor;
-			this.enumerationTypeColor = this.valueKeywordColor;
-			this.typeParameterTypeColor = this.referenceTypeColor;
-			this.delegateTypeColor = this.referenceTypeColor;
+			this.interfaceTypeColor = highlighting.GetNamedColor("InterfaceTypes");
+			this.enumerationTypeColor = highlighting.GetNamedColor("EnumTypes");
+			this.typeParameterTypeColor = highlighting.GetNamedColor("TypeParameters");
+			this.delegateTypeColor = highlighting.GetNamedColor("DelegateType");
 			this.methodDeclarationColor = this.methodCallColor = highlighting.GetNamedColor("MethodCall");
 			//this.eventDeclarationColor = this.eventAccessColor = defaultTextColor;
 			//this.propertyDeclarationColor = this.propertyAccessColor = defaultTextColor;

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionDataFactory.cs

@@ -86,8 +86,7 @@ static string StripAttributeSuffix(string text)
 
 		ICompletionData ICompletionDataFactory.CreateMemberCompletionData(IType type, IEntity member)
 		{
-			string typeName = builder.ConvertType(type).ToString();
-			return new CompletionData(typeName + "." + member.Name);
+			return new EnumMemberCompletionData(type, member, builder);
 		}
 
 		ICompletionData ICompletionDataFactory.CreateLiteralCompletionData(string title, string description, string insertText)

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs

@@ -37,14 +37,15 @@ public IEntity Entity {
 		public EntityCompletionData(IEntity entity) : base(entity.Name)
 		{
 			this.entity = entity;
-			this.Description = entity.Documentation;
 			this.Image = ClassBrowserIconService.GetIcon(entity);
+			// don't set this.Description -- we use CreateFancyDescription() instead,
+			// and accessing entity.Documentation in the constructor is too slow
 		}
 
 		protected override object CreateFancyDescription()
 		{
 			return new FlowDocumentScrollViewer {
-				Document = XmlDocFormatter.CreateTooltip(entity, false),
+				Document = XmlDocFormatter.CreateTooltip(entity, entity is ITypeDefinition),
 				VerticalScrollBarVisibility = ScrollBarVisibility.Auto
 			};
 		}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EnumMemberCompletionData.cs

@@ -0,0 +1,52 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Windows.Controls;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+using ICSharpCode.NRefactory.TypeSystem;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Editor;
+namespace CSharpBinding.Completion
+{
+	class EnumMemberCompletionData : CompletionData
+	{
+		IType enumType;
+
+		IEntity member;
+
+		public EnumMemberCompletionData(IType enumType, IEntity member, TypeSystemAstBuilder builder) : base(enumType.Name + "." + member.Name)
+		{
+			this.enumType = enumType;
+			this.member = member;
+			this.Image = ClassBrowserIconService.Const;
+			this.CompletionText = builder.ConvertType(enumType).ToString() + "." + member.Name;
+		}
+
+		protected override object CreateFancyDescription()
+		{
+			return new FlowDocumentScrollViewer {
+				Document = XmlDocFormatter.CreateTooltip(member, false),
+				VerticalScrollBarVisibility = ScrollBarVisibility.Auto
+			};
+		}
+	}
+}
+
+

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs

@@ -35,16 +35,15 @@ public IType Type {
 		public TypeCompletionData(IType type) : base(type.Name)
 		{
 			this.type = type;
-			ITypeDefinition typeDef = type.GetDefinition();
-			if (typeDef != null)
-				this.Description = typeDef.Documentation;
 			this.Image = ClassBrowserIconService.GetIcon(type);
+			// don't set this.Description -- we use CreateFancyDescription() instead,
+			// and accessing entity.Documentation in the constructor is too slow
 		}
 
 		protected override object CreateFancyDescription()
 		{
 			return new FlowDocumentScrollViewer {
-				Document = XmlDocFormatter.CreateTooltip(type, false),
+				Document = XmlDocFormatter.CreateTooltip(type),
 				VerticalScrollBarVisibility = ScrollBarVisibility.Auto
 			};
 		}

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

@@ -55,20 +55,30 @@ public override IInsightWindow ShowInsightWindow(IEnumerable<IInsightItem> items
 		{
 			if (items == null)
 				return null;
-			var insightWindow = new SharpDevelopInsightWindow(this.TextEditor.TextArea);
-			insightWindow.Items.AddRange(items);
-			if (insightWindow.Items.Count > 0) {
-				insightWindow.SelectedItem = insightWindow.Items[0];
+			var insightWindow = textEditor.ActiveInsightWindow;
+			bool isNewWindow = false;
+			if (insightWindow == null) {
+				insightWindow = new SharpDevelopInsightWindow(this.TextEditor.TextArea);
+				isNewWindow = true;
+			}
+			var adapter = new SharpDevelopInsightWindowAdapter(insightWindow);
+			adapter.Items.AddRange(items);
+			if (adapter.Items.Count > 0) {
+				adapter.SelectedItem = adapter.Items[0];
 			} else {
 				// don't open insight window when there are no items
 				return null;
 			}
-			textEditor.ShowInsightWindow(insightWindow);
-			return insightWindow;
+			insightWindow.SetActiveAdapter(adapter, isNewWindow);
+			if (isNewWindow)
+			{
+				textEditor.ShowInsightWindow(insightWindow);
+			}
+			return adapter;
 		}
 
 		public override IInsightWindow ActiveInsightWindow {
-			get { return textEditor.ActiveInsightWindow; }
+			get { return textEditor.ActiveInsightWindow.activeAdapter; }
 		}
 
 		public override ICompletionListWindow ActiveCompletionWindow {

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

@@ -43,6 +43,7 @@ public class CustomizedHighlightingColor
 
 		public bool Bold { get; set; }
 		public bool Italic { get; set; }
+		public bool Underline { get; set; }
 		public Color? Foreground { get; set; }
 		public Color? Background { get; set; }