Changeset 12655 for stable

Timestamp:

07/07/15 16:26:18 (9 years ago)

Author:

jkarder

Message:

#2419: merged r12646, r12653 and r12654 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CSharp/CSharpCodeCompletionStrategy.cs (modified) (3 diffs)
• HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CodeCompletionStrategy.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26 +25 @@
 using ICSharpCode.NRefactory.CSharp;
 using ICSharpCode.NRefactory.CSharp.Completion;
-using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.TypeSystem;
 
@@ -112 +110 @@
 
     protected override void DoParseStep() {
-      var document = (IDocument)codeEditor.Invoke(
-        (Func<IDocument>)(() => {
-          var doc = codeEditor.TextEditor.Document;
-          return new ReadOnlyDocument(doc, doc.FileName);
-        })
-      );
-
+      if (document == null) return;
       var unresolvedFile = CSharpParsingHelpers.CreateCSharpUnresolvedFile(document);
       projectContent = projectContent.AddOrUpdateFiles(unresolvedFile);

stable/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion/CodeCompletionStrategy.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using ICSharpCode.AvalonEdit.CodeCompletion;
+using ICSharpCode.NRefactory.Editor;
+using Timer = System.Timers.Timer;
 
 namespace HeuristicLab.CodeEditor {
   internal abstract class CodeCompletionStrategy : ICodeCompletionStrategy {
     protected readonly CodeEditor codeEditor;
-    protected readonly Task backgroundParser;
+    protected readonly Timer parserTimer;
+    protected IDocument document;
 
     protected CodeCompletionStrategy(CodeEditor codeEditor) {
       this.codeEditor = codeEditor;
-      backgroundParser = new Task(DoBackgroundParsing);
+      this.codeEditor.TextEditorTextChanged += codeEditor_TextEditorTextChanged;
+      parserTimer = new Timer(1000);
+      parserTimer.Elapsed += (sender, args) => Task.Run(() => {
+        DoParseStep();
+        if (codeEditor.IsDisposed && parserTimer.Enabled) {
+          parserTimer.Stop();
+          parserTimer.Dispose();
+        }
+      });
     }
 
@@ -41 +52 @@
 
     public virtual void Initialize() {
-      if (backgroundParser.Status == TaskStatus.Created)
-        backgroundParser.Start();
+      parserTimer.Enabled = true;
     }
 
@@ -89 +99 @@
     }
 
-    protected virtual void DoBackgroundParsing() {
-      while (!codeEditor.IsDisposed) {
-        DoParseStep();
-        Thread.Sleep(1000);
-      }
+    private void codeEditor_TextEditorTextChanged(object sender, EventArgs e) {
+      var doc = codeEditor.TextEditor.Document;
+      document = new ReadOnlyDocument(doc, doc.FileName);
     }
   }