From dc918729ccda585a273ef0224088a334167a3083 Mon Sep 17 00:00:00 2001 From: Mert Akengin Date: Sat, 13 Jul 2019 22:47:21 +0300 Subject: [PATCH 1/3] fix pushing empty parameter --- exec.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/exec.py b/exec.py index 9062146..b5b465f 100755 --- a/exec.py +++ b/exec.py @@ -27,7 +27,7 @@ def __init__(self, cmd, shell_cmd, env, listener, # "path" is an opt`ion in build systems path="", # "shell" is an options in build systems - shell=False): + shell=False, *args, **kwargs): if not shell_cmd and not cmd: raise ValueError("shell_cmd or cmd is required") @@ -140,7 +140,7 @@ class ExecCommand(sublime_plugin.WindowCommand, ProcessListener): errs_by_file = {} phantom_sets_by_buffer = {} show_errors_inline = True - + def run(self, cmd = None, shell_cmd = None, file_regex = "", line_regex = "", working_dir = "", encoding = "utf-8", env = {}, quiet = False, kill = False, update_phantoms_only=False, hide_phantoms_only=False, @@ -195,7 +195,7 @@ def run(self, cmd = None, shell_cmd = None, file_regex = "", line_regex = "", wo merged_env = env.copy() self.encoding = encoding self.quiet = quiet - + # Call create_output_panel a second time after assigning the above # settings, so that it'll be picked up as a result buffer @@ -218,7 +218,7 @@ def fun(self, cmd, shell_cmd, merged_env, ss): history.insert(ss) if shell_cmd: shell_cmd += " " + str(ss) - else: + elif str(ss): cmd.append(str(ss)) @@ -256,9 +256,9 @@ def fun(self, cmd, shell_cmd, merged_env, ss): try: # Forward kwargs to AsyncProcess - - self.proc = AsyncProcess(cmd, shell_cmd, merged_env, self, self.sl) - + + self.proc = AsyncProcess(cmd, shell_cmd, merged_env, self, **self.sl) + self.text_queue_lock.acquire() try: self.text_queue_proc = self.proc @@ -270,7 +270,7 @@ def fun(self, cmd, shell_cmd, merged_env, ss): self.append_string(None, self.debug_text + "\n") if not self.quiet: self.append_string(None, "[Finished]") - + def is_enabled(self, kill = False): if kill: @@ -454,4 +454,4 @@ def hide_phantoms(self): self.show_errors_inline = False def on_phantom_navigate(self, url): - self.hide_phantoms() \ No newline at end of file + self.hide_phantoms() From ce2a4e21b9abf196ca565bfe804aa7dcfa49f1bb Mon Sep 17 00:00:00 2001 From: Mert Akengin Date: Sat, 13 Jul 2019 22:52:45 +0300 Subject: [PATCH 2/3] add #9's fixes --- exec.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/exec.py b/exec.py index b5b465f..46ea099 100755 --- a/exec.py +++ b/exec.py @@ -216,10 +216,11 @@ def fun(self, cmd, shell_cmd, merged_env, ss): # self.window.create_output_panel("exec") # print("THIis" + str(ss)) history.insert(ss) - if shell_cmd: - shell_cmd += " " + str(ss) - elif str(ss): - cmd.append(str(ss)) + for s in str(ss).split() + if shell_cmd: + shell_cmd += " " + s + elif str(ss): + cmd.append(s) self.debug_text = "" From 7804fe944d1cadcee78c391810415a7a39befe33 Mon Sep 17 00:00:00 2001 From: Mert Akengin Date: Sat, 13 Jul 2019 23:15:42 +0300 Subject: [PATCH 3/3] add missing colon --- exec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exec.py b/exec.py index 46ea099..8952a43 100755 --- a/exec.py +++ b/exec.py @@ -216,7 +216,7 @@ def fun(self, cmd, shell_cmd, merged_env, ss): # self.window.create_output_panel("exec") # print("THIis" + str(ss)) history.insert(ss) - for s in str(ss).split() + for s in str(ss).split(): if shell_cmd: shell_cmd += " " + s elif str(ss):