allow to disbale aexpr in workspaces again and fix stack tests

SQUASHED: AUTO-COMMIT-src-client-lively.js,AUTO-COMMIT-src-client-preferences.js,AUTO-COMMIT-src-plugin-babel.js,AUTO-COMMIT-test-stack-test.js,
LivelyKernel · Feb 7, 2024 · 6efe490 · 6efe490
1 parent 9a3ee76
commit 6efe490
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/src/client/lively.js b/src/client/lively.js
@@ -2092,6 +2092,10 @@ export default class Lively {
   static async onBodyPositionPreference(pos) {
     lively.setPosition(document.body, pos);
   }
+
+  static async onDisableAExpWorkspacePreference(workspaceDisabled) {
+    localStorage.setItem("DisableAExpWorkspace", workspaceDisabled)
+  }
 
   static async onEnableAEDebuggingPreference(debuggingEnabled) {
     if (self.lively4isLoading) return // no recompile needed

diff --git a/src/client/preferences.js b/src/client/preferences.js
@@ -22,7 +22,7 @@ export default class Preferences {
       InteractiveLayer: {default: false, short: "dev methods"},
       ShowDocumentGrid: {default: true, short: "show grid"},
       UseRP19JSX: {default: false, short: "use rp19 implementation for jsx"},
-      /* DisableAExpWorkspace: {default: false, short: "disable AExp in workspace"}, */
+      DisableAExpWorkspace: {default: false, short: "disable AExp in workspace"}, 
       UseProxiesForAExprs: {default: false, short: "proxy-based Active Expressions"},
       EnableAEDebugging: {default: true, short: "enable Active Expression debugging"},
       SmartAELogging: {default: true, short: "Only log events for interesting Active Expressions"},

diff --git a/src/plugin-babel.js b/src/plugin-babel.js
@@ -486,24 +486,26 @@ async function workspacePlugins(options = {}) {
 
 
   result.push(...await doitPlugins())
-  result.push(...[
-    await importDefaultOf('babel-plugin-var-recorder'),
-    [await importDefaultOf('babel-plugin-ILA'), {
-      executedIn: 'file'
-    }],
-    [await importDefaultOf('babel-plugin-databindings'), {
-      executedIn: 'file'
-    }],
-    [await importDefaultOf('babel-plugin-active-expression-rewriting'), {
-      executedIn: 'workspace'
-    }],
-    [await importDefaultOf('babel-plugin-databindings-post-process'), {
-      executedIn: 'file'
-    }],
-    [await importDefaultOf('babel-plugin-active-expression-proxies'), {
+
+  result.push(await importDefaultOf('babel-plugin-var-recorder'))
+
+  if (!localStorage.getItem("DisableAExpWorkspace")) {
+    result.push(await importDefaultOf('babel-plugin-ILA'), {
+        executedIn: 'file'
+      })
+    result.push(await importDefaultOf('babel-plugin-databindings'), {
+        executedIn: 'file'
+      })
+    result.push(await importDefaultOf('babel-plugin-active-expression-rewriting'), {
+        executedIn: 'workspace'
+      })
+    result.push(await importDefaultOf('babel-plugin-databindings-post-process'), {
+        executedIn: 'file'
+      })
+    result.push(await importDefaultOf('babel-plugin-active-expression-proxies'), {
       executedIn: 'workspace'
-    }]
-  ])
+    })
+  }
   if (!options.fortesting) {
     result.push(babel7.babelPluginProposalDynamicImport)
     result.push([babel7.babelPluginTransformModulesSystemJS, {

diff --git a/test/stack-test.js b/test/stack-test.js
@@ -171,7 +171,7 @@ stack;
     };
     const stack = o.myGetter;
 
-    expect(stack.getFrame(0).func).to.equal('get myGetter [as myGetter]');
+    expect(stack.getFrame(0).func).to.equal('get myGetter');
   });
 
   it('static getter', () => {
@@ -183,7 +183,7 @@ stack;
     }
     const stack = AClass.myStaticGetter;
 
-    expect(stack.getFrame(0).func).to.equal('get myStaticGetter [as myStaticGetter]');
+    expect(stack.getFrame(0).func).to.equal('get myStaticGetter');
   });
 
   it('new as property name', () => {