Merge branch 'gh-pages' of https://github.com/LivelyKernel/lively4-core into gh-pages

Author: JensLincke

src/client/reactive/active-expression-rewriting/active-expression-rewriting.js

@@ -221,6 +221,7 @@ export class AEDebuggingCache {
   constructor() {
     this.registeredDebuggingViews = [];
     this.debouncedUpdateDebuggingViews = _.debounce(this.updateDebggingViews, 100);
+    this.changedFiles = new Set();
   }
   /*MD ## Registration MD*/
   async registerFileForAEDebugging(url, context, triplesCallback) {
@@ -231,7 +232,7 @@ export class AEDebuggingCache {
       }
       return false;
     };
-    this.registeredDebuggingViews.push(callback);
+    this.registeredDebuggingViews.push({ callback, url });
 
     triplesCallback((await this.getDependencyTriplesForFile(url)));
   }
@@ -305,24 +306,24 @@ export class AEDebuggingCache {
       } else if (type === 1) {
         if (recentDeletions > 0) {
           const matchingLines = Math.max(recentDeletions, data.length);
-          for(let i = 0; i < matchingLines; i++) {
+          for (let i = 0; i < matchingLines; i++) {
             mapping[originalLine - matchingLines + i] = [newLine, true];
             newLine++;
           }
-          data = data.substring(matchingLines)
-        } 
-        if(data.length > 0) {
+          data = data.substring(matchingLines);
+        }
+        if (data.length > 0) {
           newLine += data.length;
           recentAdditions += data.length;
         }
       } else {
         if (recentAdditions > 0) {
           const matchingLines = Math.max(recentAdditions, data.length);
-          for(let i = 0; i < matchingLines; i++) {
+          for (let i = 0; i < matchingLines; i++) {
             mapping[originalLine] = [newLine - matchingLines + i, true];
             originalLine++;
-          }          
-          data = data.substring(matchingLines)
+          }
+          data = data.substring(matchingLines);
         }
         recentDeletions += data.length;
         for (let i = 0; i < data.length; i++) {
@@ -337,13 +338,21 @@ export class AEDebuggingCache {
     return mapping;
   }
   /*MD ## Rewriting API MD*/
+  updateFiles(files) {
+    if(!files) return;
+    files.forEach(file => this.changedFiles.add(file));
+    this.debouncedUpdateDebuggingViews();
+  }
+
   async updateDebggingViews() {
     for (let i = 0; i < this.registeredDebuggingViews.length; i++) {
-      if (!(await this.registeredDebuggingViews[i]())) {
+      if (![...this.changedFiles].some(file => file.includes(this.registeredDebuggingViews[i].url))) continue;
+      if (!(await this.registeredDebuggingViews[i].callback())) {
         this.registeredDebuggingViews.splice(i, 1);
         i--;
       }
     }
+    this.changedFiles = new Set();
   }
 
   async getDependencyTriplesForFile(url) {
@@ -369,6 +378,9 @@ export class AEDebuggingCache {
     return result;
   }
 }
+
+async function relatedFiles(dependencies, aexprs) {}
+
 export const DebuggingCache = new AEDebuggingCache();
 
 const DependenciesToAExprs = {
@@ -377,23 +389,37 @@ const DependenciesToAExprs = {
 
   associate(dep, aexpr) {
     const location = aexpr.meta().get("location");
-    if(location && location.file) {      
+    if (location && location.file) {
+      DebuggingCache.updateFiles([location.file]);
       this._AEsPerFile.getOrCreate(location.file, () => new Set()).add(aexpr);
     }
     this._depsToAExprs.associate(dep, aexpr);
     dep.updateTracking();
-    DebuggingCache.debouncedUpdateDebuggingViews();
+
+    // Track affected files
+    for (const hook of HooksToDependencies.getHooksForDep(dep)) {
+      hook.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+    }
   },
 
   disconnectAllForAExpr(aexpr) {
     const location = aexpr.meta().get("location");
-    if (location && location.file && this._AEsPerFile.has(location.file)) {
-      this._AEsPerFile.get(location.file).delete(aexpr);
+    if (location && location.file) {
+      DebuggingCache.updateFiles([location.file]);
+      if( this._AEsPerFile.has(location.file)) {
+        this._AEsPerFile.get(location.file).delete(aexpr);
+      }
     }
     const deps = this.getDepsForAExpr(aexpr);
     this._depsToAExprs.removeAllLeftFor(aexpr);
     deps.forEach(dep => dep.updateTracking());
-    DebuggingCache.debouncedUpdateDebuggingViews();
+
+    // Track affected files
+    for (const dep of DependenciesToAExprs.getDepsForAExpr(aexpr)) {
+      for (const hook of HooksToDependencies.getHooksForDep(dep)) {
+        hook.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+      }
+    }
   },
 
   getAEsInFile(url) {
@@ -431,12 +457,26 @@ const HooksToDependencies = {
 
   associate(hook, dep) {
     this._hooksToDeps.associate(hook, dep);
-    DebuggingCache.debouncedUpdateDebuggingViews();
+
+    // Track affected files
+    hook.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+    for (const ae of DependenciesToAExprs.getAExprsForDep(dep)) {
+      if(ae.meta().has("location")) {
+        DebuggingCache.updateFiles([ae.meta().get("location").file]);
+      }
+    }
   },
 
   remove(hook, dep) {
     this._hooksToDeps.remove(hook, dep);
-    DebuggingCache.debouncedUpdateDebuggingViews();
+
+    // Track affected files
+    hook.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+    for (const ae of DependenciesToAExprs.getAExprsForDep(dep)) {      
+      if(ae.meta().has("location")) {
+        DebuggingCache.updateFiles([ae.meta().get("location").file]);
+      }
+    }
   },
 
   async getHooksInFile(url) {
@@ -453,7 +493,16 @@ const HooksToDependencies = {
 
   disconnectAllForDependency(dep) {
     this._hooksToDeps.removeAllLeftFor(dep);
-    DebuggingCache.debouncedUpdateDebuggingViews();
+
+    // Track affected files
+    for (const hook of HooksToDependencies.getHooksForDep(dep)) {
+      hook.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+    }
+    for (const ae of DependenciesToAExprs.getAExprsForDep(dep)) {      
+      if(ae.meta().has("location")) {
+        DebuggingCache.updateFiles([ae.meta().get("location").file]);
+      }
+    }
   },
 
   getDepsForHook(hook) {
@@ -516,6 +565,7 @@ class Hook {
   }
 
   addLocation(location) {
+    if (!location) return;
     if (!this.locations.some(loc => _.isEqual(loc, location))) {
       this.locations.push(location);
     }
@@ -529,6 +579,15 @@ class Hook {
 
   notifyDependencies() {
     HooksToDependencies.getDepsForHook(this).forEach(dep => dep.notifyAExprs());
+    
+    this.getLocations().then(locations => DebuggingCache.updateFiles(locations.map(loc => loc.file)));
+    for (const dep of HooksToDependencies.getDepsForHook(this)) {
+      for (const ae of DependenciesToAExprs.getAExprsForDep(dep)) {
+        if(ae.meta().has("location")) {
+          DebuggingCache.updateFiles([ae.meta().get("location").file]);
+        }
+      }
+    }
   }
 }
 
@@ -877,23 +936,20 @@ class TracingHandler {
     if (!hook) return;
     hook.addLocation(location || TracingHandler.findRegistrationLocation());
     hook.notifyDependencies();
-    DebuggingCache.debouncedUpdateDebuggingViews();
   }
 
   static globalUpdated(globalName, location) {
     const hook = SourceCodeHook.get(globalRef, globalName);
     if (!hook) return;
     hook.addLocation(location || TracingHandler.findRegistrationLocation());
     hook.notifyDependencies();
-    DebuggingCache.debouncedUpdateDebuggingViews();
   }
 
   static localUpdated(scope, varName, location) {
     const hook = SourceCodeHook.get(scope, varName);
     if (!hook) return;
     hook.addLocation(location || TracingHandler.findRegistrationLocation());
     hook.notifyDependencies();
-    DebuggingCache.debouncedUpdateDebuggingViews();
   }
 
   static async findRegistrationLocation() {

src/client/reactive/components/basic/aexpr-timeline.js

@@ -121,9 +121,13 @@ export default class EventDrops extends Morph {
     //Register to overview selection changes
     jQuery(this.aeOverview).on("changed.jstree", (e, data) => {
       this.eventsChanged();
-    }
+    });
+    this.ready = false;                 
+    jQuery(this.aeOverview).one("ready.jstree", (e, data) => {
+      this.ready = true;
+    });
     //Register to grouping change
-    );this.groupByLine.addEventListener('change', () => {
+    this.groupByLine.addEventListener('change', () => {
       if (this.groupByLine.checked) {
         this.groupingFunction = this.locationGrouping();
       } else {
@@ -259,12 +263,12 @@ export default class EventDrops extends Morph {
       return { ae, events: ae.meta().get('events').filter(event => event.type === "changed value").filter(this.filterFunction) };
     });
     this.valuesOverTime.innerHTML = "";
-    
-    for(const {ae, events} of aeWithRelevantEvents) {
-      if(events.length === 0) continue;
-      let row = <tr><th>{ae.meta().get('id')}</th></tr>
+
+    for (const { ae, events } of aeWithRelevantEvents) {
+      if (events.length === 0) continue;
+      let row = <tr><th>{ae.meta().get('id')}</th></tr>;
       row.append(<td>{events[0].value.lastValue}</td>);
-      for(const event of events) {
+      for (const event of events) {
         row.append(<td>{event.value.value}</td>);
       }
       this.valuesOverTime.append(row);
@@ -273,7 +277,7 @@ export default class EventDrops extends Morph {
 
   updateOverview(aexprs) {
     jQuery(this.aeOverview).jstree(true).settings.core.data = this.generateOverviewJSON(aexprs);
-    jQuery(this.aeOverview).jstree(true).refresh();
+    jQuery(this.aeOverview).jstree(true).refresh(true);
   }
 
   generateOverviewJSON(aexprs) {
@@ -330,6 +334,29 @@ export default class EventDrops extends Morph {
     this.detached = true;
   }
 
+  filterToAEs(aes) {
+    const tree = jQuery(this.aeOverview).jstree(true);
+    tree.deselect_all();
+    if(this.ready) {      
+      for(const ae of aes) {
+        tree.select_node(ae.timelineID + 1);
+      }
+    } else {       
+      this.filteredAEs = aes;      
+      jQuery(this.aeOverview).on("refresh.jstree", (e, data) => {
+        if(this.filteredAEs) {        
+          for(const ae of this.filteredAEs) {
+            tree.select_node(ae.timelineID + 1);
+          }
+          if(tree.get_node([...this.filteredAEs][0])) {
+            this.filteredAEs = [];
+          }
+        }
+      });
+      tree.refresh();
+    }
+  }
+
   get diagram() {
     return this.get("#diagram");
   }