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

… into gh-pages
LivelyKernel · Sep 27, 2023 · 0b3f04e · 0b3f04e
2 parents ba9db8a + b573a72
commit 0b3f04e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/client/Falleri2014FGA_algorithm2.png b/src/client/Falleri2014FGA_algorithm2.png
diff --git a/src/components/tools/treesitter-matches.js b/src/components/tools/treesitter-matches.js
@@ -16,7 +16,7 @@ export default class TreesitterMatches extends Morph {
       let dotNodes = []
 
       visit(rootNode, node => {
-          dotNodes.push(`${node.id}[label="${node.type}"]`)
+          dotNodes.push(`${node.id}[label="${node.type.replace(/\"/,'\\"')}"]`)
           if (node.parent) dotEdges.push(`${node.parent.id} -> ${node.id}`)
         })  
 

diff --git a/test/domain-code-test.js b/test/domain-code-test.js
@@ -105,7 +105,7 @@ l`
       expect(root.children[0].children[0].type).equals("assignment_expression")
     })
 
-     it('reconciles change when removing statement at end', () => {
+     xit('reconciles change when removing statement at end', () => {
       let sourceOriginal = `a = 3
 l`
       let sourceNew = `a = 3`
@@ -116,7 +116,7 @@ l`
       expect(root.children[0].children[0].type).equals("assignment_expression")
     })
 
-     it('reconciles change when removing statement at start', () => {
+     xit('reconciles change when removing statement at start', () => {
       let sourceOriginal = `l
 a = 3`
       let sourceNew = `a = 3`
@@ -127,7 +127,7 @@ a = 3`
       expect(root.children[0].children[0].type).equals("assignment_expression")
     })
 
-     it('reconciles change when adding new statement at start of a function', () => {
+     xit('reconciles change when adding new statement at start of a function', () => {
       let sourceOriginal = `function() {
   
   let a = 3

diff --git a/test/templates/lively-script-test.js b/test/templates/lively-script-test.js
@@ -76,7 +76,7 @@ describe("LivelyScriptTest",  function() {
       </lively-script>`
     root.innerHTML = source
     await components.loadUnresolved(root);
-    await lively.sleep(150); // ok, there is aysnc behavior here... give it a chance to run
+    await lively.sleep(200); // ok, there is aysnc behavior here... give it a chance to run
     expect(self.testScriptExecOrder, "script exec order" + JSON.stringify(self.testScriptExecOrder)).deep.equal(
       ["a", "b", "c", "d", "e"])  
   });