Changeset 12646 for trunk

Timestamp:

07/07/15 14:26:44 (9 years ago)

Author:

jkarder

Message:

#2419: refactored CodeCompletionStrategy and CSharpCodeCompletionStrategy

Location:

trunk/sources/HeuristicLab.CodeEditor/3.4/LanguageFeatures/CodeCompletion

Files:

• CSharp/CSharpCodeCompletionStrategy.cs (modified) (3 diffs)
• CodeCompletionStrategy.cs (modified) (3 diffs)

trunk/sources/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);

trunk/sources/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;
 
 namespace HeuristicLab.CodeEditor {
@@ -29 +31 @@
     protected readonly CodeEditor codeEditor;
     protected readonly Task backgroundParser;
+    protected IDocument document;
 
     protected CodeCompletionStrategy(CodeEditor codeEditor) {
       this.codeEditor = codeEditor;
+      this.codeEditor.TextEditorTextChanged += codeEditor_TextEditorTextChanged;
       backgroundParser = new Task(DoBackgroundParsing);
     }
@@ -95 +99 @@
       }
     }
+
+    private void codeEditor_TextEditorTextChanged(object sender, EventArgs e) {
+      var doc = codeEditor.TextEditor.Document;
+      document = new ReadOnlyDocument(doc, doc.FileName);
+    }
   }
 }