Merge pull request #111 from rsteube/xonsh-fix-callback

xonsh: fix empty callback result
carapace-sh · Nov 18, 2020 · a527486 · a527486
2 parents 6c6fd64 + 0e28e55
commit a527486
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/example/cmd/root_test.go b/example/cmd/root_test.go
@@ -940,8 +940,11 @@ def _example_completer(prefix, line, begidx, endidx, ctx):
                                      stdout=subprocess.PIPE,
                                      stderr=subprocess.PIPE).communicate()
         cb = cb.decode('utf-8')
-        nonlocal prefix, line, begidx, endidx, ctx
-        return eval(cb)
+        if cb == "":
+            return {}
+        else:
+            nonlocal prefix, line, begidx, endidx, ctx
+            return eval(cb)
    
     if False:
         pass

diff --git a/xonsh/snippet.go b/xonsh/snippet.go
@@ -86,8 +86,11 @@ def _%v_completer(prefix, line, begidx, endidx, ctx):
                                      stdout=subprocess.PIPE,
                                      stderr=subprocess.PIPE).communicate()
         cb = cb.decode('utf-8')
-        nonlocal prefix, line, begidx, endidx, ctx
-        return eval(cb)
+        if cb == "":
+            return {}
+        else:
+            nonlocal prefix, line, begidx, endidx, ctx
+            return eval(cb)
    
     if False:
         pass%s