Commands: recognize more file types for mix format (#51)

Author: azizk

commands/mix_format.py

@@ -26,7 +26,7 @@ def run(self, _edit, **kwargs):
     call_mix_format(window, file_path=file_path)
 
   def is_enabled(self):
-    return is_elixir_syntax(self.view)
+    return is_formattable_syntax(self.view)
 
 class MixFormatToggleAutoFormatCommand(sublime_plugin.TextCommand):
   def description(self):
@@ -40,11 +40,11 @@ def run(self, _edit, **_kwargs):
     print_status_msg('%s auto-formatting!' % ['Disabled', 'Enabled'][on_save])
 
   def is_enabled(self):
-    return is_elixir_syntax(self.view)
+    return is_formattable_syntax(self.view)
 
 class MixFormatOnSaveListener(sublime_plugin.EventListener):
   def is_elixir_file(self, view):
-    return is_elixir_syntax(view)
+    return is_formattable_syntax(view)
 
   def on_post_save(self, view):
     if not self.is_elixir_file(view):

commands/utils.py

@@ -21,8 +21,16 @@ def expand_scope_right(view, begin_point, scope):
   )
   return sublime.Region(begin_point, end_point)
 
+def is_one_of_syntaxes(view, syntaxes):
+  view_syntax_path = view.settings().get('syntax')
+  return any(basename + '.sublime-syntax' in view_syntax_path for basename in syntaxes)
+
 def is_elixir_syntax(view):
-  return 'Elixir.sublime-syntax' in view.settings().get('syntax')
+  return is_one_of_syntaxes(view, ['Elixir'])
+
+def is_formattable_syntax(view):
+  syntaxes = ['Elixir', 'EEx', 'Elixir (EEx)', 'HTML (EEx)', 'HTML (HEEx)', 'HTML (Surface)']
+  return is_one_of_syntaxes(view, syntaxes)
 
 def reverse_find_root_folder(bottom_path):
   bottom_path = Path(bottom_path)

keymaps/Default.sublime-keymap

@@ -9,6 +9,6 @@
   { "keys": ["alt+shift+r"], "command": "mix_test_repeat" },
   // Formats the source file.
   { "keys": ["alt+shift+f"], "command": "mix_format_file",
-    "context": [ { "key": "selector", "operator": "equal", "operand": "source.elixir" } ]
+    "context": [ { "key": "selector", "operator": "equal", "operand": "source.elixir | source.elixir.eex | text.eex | text.html.eex | text.html.heex | text.html.surface" } ]
   },
 ]