Changeset 11738 for branches/CodeEditor/HeuristicLab.CodeEditor

Timestamp:

01/07/15 17:20:05 (10 years ago)

Author:

jkarder

Message:

#2077:

• set CodeEditor.AutoScaleMode to AutoScaleMode.Inherit
• only generate overload information if completion data is available

Location:

branches/CodeEditor/HeuristicLab.CodeEditor/3.4

Files:

• CodeEditor.Designer.cs (modified) (1 diff)
• LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionStrategy.cs (modified) (2 diffs)

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/CodeEditor.Designer.cs

@@ -39 +39 @@
       // CodeEditor
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.elementHost);
       this.Name = "CodeEditor";

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ICSharpCode.NRefactory.Completion;
 using ICSharpCode.NRefactory.CSharp;
@@ -82 +83 @@
       result.TriggerWord = completionContext.Document.GetText(completionContext.Offset - triggerWordLength, triggerWordLength);
 
-      foreach (var completion in completionData) {
-        var cast = completion as CompletionData;
-        if (cast != null) {
-          cast.TriggerWord = result.TriggerWord;
-          cast.TriggerWordLength = result.TriggerWordLength;
-          result.CompletionData.Add(cast);
+      if (completionData.Any()) {
+        foreach (var completion in completionData) {
+          var cast = completion as CompletionData;
+          if (cast != null) {
+            cast.TriggerWord = result.TriggerWord;
+            cast.TriggerWordLength = result.TriggerWordLength;
+            result.CompletionData.Add(cast);
+          }
         }
-      }
 
-      if (!controlSpace) {
-        var pce = new CSharpParameterCompletionEngine(
-          completionContext.Document,
-          completionContext.CompletionContextProvider,
-          completionFactory,
-          completionContext.ProjectContent,
-          completionContext.TypeResolveContextAtCaret
-        );
+        if (!controlSpace) {
+          var pce = new CSharpParameterCompletionEngine(
+            completionContext.Document,
+            completionContext.CompletionContextProvider,
+            completionFactory,
+            completionContext.ProjectContent,
+            completionContext.TypeResolveContextAtCaret
+          );
 
-        var parameterDataProvider = pce.GetParameterDataProvider(completionContext.Offset, completionChar);
-        result.OverloadProvider = parameterDataProvider as IUpdatableOverloadProvider;
+          var parameterDataProvider = pce.GetParameterDataProvider(completionContext.Offset, completionChar);
+          result.OverloadProvider = parameterDataProvider as IUpdatableOverloadProvider;
+        }
       }