Changeset 11722

Timestamp:

12/23/14 13:39:27 (9 years ago)

Author:

jkarder

Message:

#2077:

• added completion image for templates
• cleaned CSharpCodeCompletionDataFactory
• sorted foldings by start offset

Location:

branches/CodeEditor/HeuristicLab.CodeEditor/3.4

Files:

• HeuristicLab.CodeEditor-3.4.csproj (modified) (2 diffs)
• LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionDataFactory.cs (modified) (3 diffs)
• LanguageFeatures/CodeCompletion/CSharp/CompletionData/Images/CompletionImage.cs (modified) (3 diffs)
• LanguageFeatures/CodeCompletion/CSharp/CompletionData/Images/Template.png (added)
• LanguageFeatures/CodeFolding/CSharp/CSharpCodeFoldingStrategy.cs (modified) (1 diff)

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

@@ -192 +192 @@
     </Page>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Resource Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\Images\Class.png" />
@@ -218 +217 @@
     <Resource Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\Images\StaticClass.png" />
     <Resource Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\Images\Struct.png" />
+    <Resource Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\Images\Template.png" />
     <Resource Include="LanguageFeatures\CodeCompletion\CSharp\CompletionData\Images\VirtualMethod.png" />
   </ItemGroup>

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionDataFactory.cs

@@ -71 +71 @@
 
     public ICompletionData CreateXmlDocCompletionData(string title, string description = null, string insertText = null) {
-      return new CompletionData("TODO: xml doc creation");
+      return new CompletionData(title) {
+        Description = description,
+        CompletionText = insertText ?? title,
+        Image = CompletionImage.Template.BaseImage,
+      };
     }
 
@@ -87 +91 @@
 
     public ICompletionData CreateEventCreationCompletionData(string varName, IType delegateType, IEvent evt, string parameterDefinition, IUnresolvedMember currentMember, IUnresolvedTypeDefinition currentType) {
-      return new CompletionData("TODO: event creation");
+      return new CompletionData(varName);
     }
 
     public ICompletionData CreateNewOverrideCompletionData(int declarationBegin, IUnresolvedTypeDefinition type, IMember m) {
-      return new CompletionData("TODO: override creation");
+      return new CompletionData(m.Name);
     }
 
     public ICompletionData CreateNewPartialCompletionData(int declarationBegin, IUnresolvedTypeDefinition type, IUnresolvedMember m) {
-      return new CompletionData("TODO: partial creation");
+      return new CompletionData(m.Name);
     }
 
     public ICompletionData CreateImportCompletionData(IType type, bool useFullName, bool addForTypeCreation) {
       var typeDef = type.GetDefinition();
-      if (typeDef != null) return new ImportCompletionData(typeDef, context.TypeResolveContextAtCaret, useFullName);
-      throw new InvalidOperationException("Should never happen");
+      return new ImportCompletionData(typeDef, context.TypeResolveContextAtCaret, useFullName);
     }
 
     public IEnumerable<ICompletionData> CreateCodeTemplateCompletionData() {
-      yield return new CompletionData("TODO: code template creation"); ;
+      yield break;
     }
 
     public ICompletionData CreateFormatItemCompletionData(string format, string description, object example) {
-      return new CompletionData("TODO: format item creation");
+      return null;
     }
 
     public IEnumerable<ICompletionData> CreatePreProcessorDefinesCompletionData() {
-      yield return new CompletionData("TODO: pre processor creation"); ;
+      yield break;
     }
     #endregion
@@ -131 +134 @@
 
     public IParameterDataProvider CreateIndexerParameterDataProvider(int startOffset, IType type, IEnumerable<IProperty> accessibleIndexers, ICSharpCode.NRefactory.CSharp.AstNode resolvedNode) {
-      throw new NotImplementedException();
+      return null;
     }
 

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CompletionData/Images/CompletionImage.cs

@@ -1 @@
-#region License
+#region License Information
 // 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)
-#endregion
-
-#region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -84 +82 @@
     static readonly CompletionImage imageLiteral = new CompletionImage("Literal", false);
     static readonly CompletionImage imageEnumValue = new CompletionImage("EnumValue", false);
+    static readonly CompletionImage imageTemplate = new CompletionImage("Template", false);
 
     /// <summary>Gets the image used for non-static classes.</summary>
@@ -96 +95 @@
     /// <summary>Gets the image used for enum values.</summary>
     public static CompletionImage EnumValue { get { return imageEnumValue; } }
+
+    /// <summary>Gets the image used for templates.</summary>
+    public static CompletionImage Template { get { return imageTemplate; } }
 
     static readonly CompletionImage imageMethod = new CompletionImage("Method", true);

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeFolding/CSharp/CSharpCodeFoldingStrategy.cs

@@ -47 +47 @@
       v.document = foldingContext.Document;
       foldingContext.SyntaxTree.AcceptVisitor(v);
-      result.FoldingData = v.foldings;
+      result.FoldingData = v.foldings.OrderBy(x => x.StartOffset).ToList();
 
       var firstError = foldingContext.SyntaxTree.Errors.FirstOrDefault();