Merge branch 'development' of https://github.com/fdorg/flashdevelop into development

Author: Meychi

External/Plugins/ASCompletion/Context/ASContext.cs

@@ -513,6 +513,8 @@ static public void RebuildClasspath()
         /// </summary>
         public virtual void ReleaseClasspath()
         {
+            PathExplorer.BeginUpdate();
+
             if (started && classPath != null)
             {
                 foreach (PathModel aPath in classPath) aPath.InUse = false;
@@ -529,6 +531,8 @@ public virtual void FinalizeClasspath()
                 foreach (PathModel aPath in classPath) aPath.InUse = true;
             }
             PathModel.Compact();
+
+            PathExplorer.EndUpdate();
         }
 
         /// <summary>

External/Plugins/ASCompletion/Model/PathExplorer.cs

@@ -26,6 +26,7 @@ static public bool IsWorking
         }
 
         static private bool uistarted;
+        static private bool contextUpdating;
         static private Queue<PathExplorer> waiting = new Queue<PathExplorer>();
         static private volatile Thread explorerThread;
         static private volatile bool stopExploration;
@@ -69,6 +70,16 @@ static public void ClearAll()
             lock (waiting) { waiting.Clear(); }
         }
 
+        static public void BeginUpdate()
+        {
+            contextUpdating = true;
+        }
+
+        static public void EndUpdate()
+        {
+            contextUpdating = false;
+        }
+
         static public void ClearPersistentCache()
         {
             string cacheDir = GetCachePath();
@@ -145,6 +156,12 @@ private static void ExploreInBackground()
             {
                 PathExplorer next = null;
 
+                if (contextUpdating)
+                {
+                    Thread.Sleep(100);
+                    continue;
+                }
+
                 lock (waiting)
                 {
                     if (waiting.Count > 0) next = waiting.Dequeue();