Merge branch 'master' into testing

* master:
  fix var get
  Add config vars to open new and alternate files
  Return test/src path discriminators
  Remove alt paths from stop_paths

Author: hkupty

rplugin/python3/acid/commands/alternate_file.py

@@ -40,6 +40,10 @@ def prepare_payload(self):
         path = current_file(self.nvim)
         root_path = current_path(self.nvim)
         rel_path = os.path.relpath(path, start=root_path).split('/')
+        open_with = self.nvim.vars.get(
+            'acid_open_alternate_file_with',
+            nvim.vars.get('acid_open_new_file_with', 'edit')
+        )
 
         if rel_path[0] in src:
             log_debug("Current file is a 'src', changing to 'test'")
@@ -57,7 +61,7 @@ def prepare_payload(self):
             )
 
         if os.path.exists(alt_path):
-            self.nvim.command('edit {}'.format(alt_path))
+            self.nvim.command('silent {} {}'.format(open_with, alt_path))
         else:
             ns = path_to_ns(alt_path, test | src)
             self.nvim.command('AcidNewFile {}'.format(ns))

rplugin/python3/acid/commands/new.py

@@ -23,12 +23,13 @@ def prompt_default(nvim):
     def prepare_payload(self, ns):
         fname = "{}.clj".format(ns_to_path(ns))
         base = 'test' if ns.endswith('-test') else 'src'
+        open_with = self.nvim.vars.get('acid_open_new_file_with', 'edit')
         path = os.path.join(current_path(self.nvim), base, fname)
 
         with open(path, 'w') as fpath:
             fpath.write('(ns {})'.format(ns))
 
-        self.nvim.command('silent edit {}'.format(path))
+        self.nvim.command('silent {} {}'.format(open_with, path))
 
         # Does not interact with nrepl
         return None

rplugin/python3/acid/nvim/__init__.py

@@ -126,8 +126,7 @@ def src_paths(nvim):
     return {'src', *nvim.vars.get('acid_alt_paths', [])}
 
 def get_stop_paths(nvim):
-    return set() | test_paths(nvim) | src_paths(nvim)
-
+    return {'test', 'src'}
 
 def find_file_in_path(nvim, msg):
     fname = msg['file']