Changeset 2719

Timestamp:

01/29/10 14:33:03 (15 years ago)

Author:

epitzer

Message:

try a different method for signaling the parser thread to terminate (#842)

Location:

trunk/sources/HeuristicLab.CodeEditor/3.2

Files:

• CodeEditor.Designer.cs (modified) (1 diff)
• CodeEditor.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.CodeEditor/3.2/CodeEditor.Designer.cs

@@ -12 +12 @@
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
-      if (InvokeRequired) {
-        Invoke(new Action(() => this.Dispose(disposing)));
-      } else {
-        if (disposing) {
-          if (components != null) {
-            components.Dispose();
-          }
+      runParser = false;
+      if (disposing) {
+        if (components != null) {
+          components.Dispose();
         }
-        base.Dispose(disposing);
       }
+      base.Dispose(disposing);
     }
 

trunk/sources/HeuristicLab.CodeEditor/3.2/CodeEditor.cs

@@ -306 +306 @@
     }
 
+    private bool runParser = true;
     private void ParserThread() {
       BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Loading mscorlib..."; }));
@@ -311 +312 @@
       ParseStep();
       BeginInvoke(new MethodInvoker(delegate { parserThreadLabel.Text = "Ready"; }));
+      while (runParser && !IsDisposed) {
+        ParseStep();
+        Thread.Sleep(2000);
+      }
+    }
+
+    private void ParseStep() {
       try {
-        while (!IsDisposed) {
-          ParseStep();
-          Thread.Sleep(2000);
-        }
+        string code = null;
+        Invoke(new MethodInvoker(delegate { code = textEditor.Text; }));
+        TextReader textReader = new StringReader(code);
+        Dom.ICompilationUnit newCompilationUnit;
+        NRefactory.SupportedLanguage supportedLanguage;
+        supportedLanguage = NRefactory.SupportedLanguage.CSharp;
+        using (NRefactory.IParser p = NRefactory.ParserFactory.CreateParser(supportedLanguage, textReader)) {
+          p.ParseMethodBodies = false;
+          p.Parse();
+          newCompilationUnit = ConvertCompilationUnit(p.CompilationUnit);
+        }
+        projectContent.UpdateCompilationUnit(lastCompilationUnit, newCompilationUnit, DummyFileName);
+        lastCompilationUnit = newCompilationUnit;
+        parseInformation.SetCompilationUnit(newCompilationUnit);
       } catch { }
-    }
-
-    private void ParseStep() {
-      string code = null;
-      Invoke(new MethodInvoker(delegate {
-        code = textEditor.Text;
-      }));
-      TextReader textReader = new StringReader(code);
-      Dom.ICompilationUnit newCompilationUnit;
-      NRefactory.SupportedLanguage supportedLanguage;
-      supportedLanguage = NRefactory.SupportedLanguage.CSharp;
-      using (NRefactory.IParser p = NRefactory.ParserFactory.CreateParser(supportedLanguage, textReader)) {
-        p.ParseMethodBodies = false;
-        p.Parse();
-        newCompilationUnit = ConvertCompilationUnit(p.CompilationUnit);
-      }
-      projectContent.UpdateCompilationUnit(lastCompilationUnit, newCompilationUnit, DummyFileName);
-      lastCompilationUnit = newCompilationUnit;
-      parseInformation.SetCompilationUnit(newCompilationUnit);
     }