Runtsafe order bug

synapse/cmds/cortex.py

@@ -377,7 +377,7 @@ def _onErr(self, mesg):
                 text = text.replace('\n', ' ')
                 # Handle too-long text
                 if tlen > 60:
-                    text = text[pos - 30:pos + 30]
+                    text = text[max(0, pos - 30):pos + 30]
                     if pos < tlen - 30:
                         text += '...'
                     if pos > 30:

synapse/lib/ast.py

@@ -522,18 +522,15 @@ class VarEvalOper(Oper):
     '''
     async def run(self, runt, genr):
 
-        if self.isRuntSafe(runt):
-
-            async for item in genr:
-                yield item
+        anynodes = False
+        async for node, path in genr:
+            anynodes = True
+            await self.kids[0].compute(path)
+            yield node, path
 
+        if not anynodes and self.isRuntSafe(runt):
             await self.kids[0].runtval(runt)
 
-        else:
-            async for node, path in genr:
-                await self.kids[0].compute(path)
-                yield node, path
-
 class SwitchCase(Oper):
 
     def prepare(self):

synapse/tests/test_cortex.py

@@ -2768,6 +2768,12 @@ async def test_storm_ifstmt(self):
             nodes = await core.nodes(q)
             self.len(1, nodes)
 
+    async def test_storm_order(self):
+        q = '''[test:str=foo :hehe=bar] $tvar=$lib.text() $tvar.add(1) $tvar.add(:hehe) $lib.print($tvar.str()) '''
+        async with self.getTestCore() as core:
+            mesgs = await core.streamstorm(q).list()
+            self.stormIsInPrint('1bar', mesgs)
+
     async def test_feed_splice(self):
 
         iden = s_common.guid()