remove settings from reset call, fix restart command

application_commands.py

@@ -1,6 +1,8 @@
 import sublime_plugin
+import sys, os
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 
-from SublimeStackIDE.stack_ide_manager import StackIDEManager
+from stack_ide_manager import StackIDEManager
 
 
 class RestartStackIde(sublime_plugin.ApplicationCommand):

stack_ide_manager.py

@@ -134,19 +134,19 @@ def for_window(cls, window):
 
     @classmethod
     def kill_all(cls):
-        Log.normal("Killing all stack-ide-sublime instances:", {k:str(v) for k,v in StackIDEManager.ide_backend_instances.items()})
+        # Log.normal("Killing all stack-ide-sublime instances:", {k:str(v) for k, v in StackIDEManager.ide_backend_instances.items()})
         for instance in StackIDEManager.ide_backend_instances.values():
+            print("yo")
             instance.end()
 
     @classmethod
-    def reset(cls, settings):
+    def reset(cls):
         """
         Kill all instances, and forget about previous notifications.
         """
         Log.normal("Resetting StackIDE")
-        cls.kill_all()
+        StackIDEManager.kill_all()
         reset_complaints()
-        cls.settings = settings
 
     @classmethod
     def configure(cls, settings):

test/test_stack_ide_manager.py

@@ -110,6 +110,28 @@ def test_retains_existing_instances(self):
         self.assertEqual(1, len(StackIDEManager.ide_backend_instances))
         sublime.destroy_windows()
 
+    def test_reset(self):
+        window = mock_window(['.'])
+        sublime.add_window(window)
+
+        StackIDEManager.check_windows()
+        self.assertEqual(1, len(StackIDEManager.ide_backend_instances))
+
+        # substitute a 'live' instance
+        backend = MagicMock()
+        stack_ide.stack_ide_loadtargets = Mock(return_value=['app/Main.hs', 'src/Lib.hs'])
+        instance = stack_ide.StackIDE(window, test_settings, backend)
+        StackIDEManager.ide_backend_instances[window.id()] = instance
+
+        StackIDEManager.reset()
+
+        # instances should be shut down.
+        self.assertEqual(1, len(StackIDEManager.ide_backend_instances))
+        self.assertFalse(instance.is_alive)
+        backend.send_request.assert_called_with(Req.get_shutdown())
+
+        sublime.destroy_windows()
+
 
 
 

watchdog.py

@@ -32,7 +32,7 @@ def plugin_loaded():
 def plugin_unloaded():
     global watchdog
     watchdog.kill()
-    StackIDEManager.reset(settings)
+    StackIDEManager.reset()
     watchdog = None
 
 
@@ -54,7 +54,8 @@ def on_settings_changed():
         Log._set_verbosity(updated_settings.verbosity)
     elif updated_settings.add_to_PATH != settings.add_to_PATH:
         Log.normal("Settings changed, reloading backends")
-        StackIDEManager.reset(updated_settings)
+        StackIDEManager.configure(updated_settings)
+        StackIDEManager.reset()
     elif updated_settings.show_popup != settings.show_popup:
         Win.show_popup = updated_settings.show_popup