Changeset 11819 for trunk/sources

Timestamp:

01/23/15 12:27:42 (9 years ago)

Author:

jkarder

Message:

#2077:

• added temporary fix to avoid crash trough code completion
• fixed updating of compilation succeeded/failed messages
• added Keys and Values properties to the Variables class (again)

Location:

trunk/sources

Files:

• HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpOverloadProvider.cs (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Variables.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpOverloadProvider.cs

@@ -115 +115 @@
 
       int parameterIndex = pce.GetCurrentParameterIndex(startOffset, completionContext.Offset);
-      if (parameterIndex < 0) {
+      if (parameterIndex < 0 || !items.Any()) {
         RequestClose = true;
         return;

trunk/sources/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

@@ -38 +38 @@
   [Content(typeof(Script), true)]
   public partial class ScriptView : NamedItemView {
+    private const string NotCompiledMessage = "Not compiled";
+    private const string CompilationSucceededMessage = "Compilation succeeded";
+    private const string CompilationFailedMessage = "Compilation failed";
     private const string AssembliesLoadingMessage = "Loading Assemblies";
     private const string AssembliesUnloadingMessage = "Unloading Assemblies";
@@ -84 +87 @@
         if (Content.CompileErrors == null) {
           compilationLabel.ForeColor = SystemColors.ControlDarkDark;
-          compilationLabel.Text = "Not compiled";
-        } else if (Content.CompileErrors.HasErrors) {
-          compilationLabel.ForeColor = Color.DarkRed;
-          compilationLabel.Text = "Compilation failed";
-        } else {
-          compilationLabel.ForeColor = Color.DarkGreen;
-          compilationLabel.Text = "Compilation successful";
+          compilationLabel.Text = NotCompiledMessage;
         }
       }
@@ -119 +116 @@
       try {
         Content.Compile();
-        outputTextBox.AppendText("Compilation succeeded.");
+        outputTextBox.AppendText(CompilationSucceededMessage);
+        compilationLabel.ForeColor = Color.DarkGreen;
+        compilationLabel.Text = CompilationSucceededMessage;
         return true;
       } catch (InvalidOperationException) {
         if (Content.CompileErrors.HasErrors) {
-          outputTextBox.AppendText("Compilation failed.");
+          outputTextBox.AppendText(CompilationFailedMessage);
+          compilationLabel.ForeColor = Color.DarkRed;
+          compilationLabel.Text = CompilationFailedMessage;
           return false;
         } else {
-          outputTextBox.AppendText("Compilation succeeded.");
+          outputTextBox.AppendText(CompilationSucceededMessage);
+          compilationLabel.ForeColor = Color.DarkGreen;
+          compilationLabel.Text = CompilationSucceededMessage;
           return true;
         }

trunk/sources/HeuristicLab.Scripting/3.3/Variables.cs

@@ -6 +6 @@
   public class Variables : DynamicObject, IEnumerable<KeyValuePair<string, object>> {
     private readonly VariableStore variableStore;
+
+    public IEnumerable<string> Keys {
+      get { return variableStore.Keys; }
+    }
+
+    public IEnumerable<object> Values {
+      get { return variableStore.Values; }
+    }
 
     public Variables(VariableStore variableStore) {