Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/py/event_listeners.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@
class HtmlprettifyEventListeners(EventListener):
@staticmethod
def on_pre_save(view):
if get_pref("format_on_save"):
if get_pref("format_on_save", view):
view.run_command("htmlprettify")

@staticmethod
def on_load_async(view):
if get_pref("format_on_open"):
if get_pref("format_on_open", view):
view.run_command("htmlprettify")

@staticmethod
def on_activated_async(view):
if get_pref("format_on_focus"):
if get_pref("format_on_focus", view):
view.run_command("htmlprettify")

@staticmethod
def on_deactivated_async(view):
if get_pref("format_on_focus_lost"):
if get_pref("format_on_focus_lost", view):
view.run_command("htmlprettify")

@staticmethod
@debounce(1)
def on_modified_async(view):
if get_pref("format_while_editing"):
if get_pref("format_while_editing", view):
view.run_command("htmlprettify")
14 changes: 7 additions & 7 deletions src/py/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@


def main(view, edit):
format_selection_only = get_pref("format_selection_only")
save_to_temp_file = get_pref("save_to_temp_file_before_prettifying")
global_file_rules = get_pref("global_file_rules")
respect_editorconfig_files = get_pref("respect_editorconfig_files")
format_selection_only = get_pref("format_selection_only", view)
save_to_temp_file = get_pref("save_to_temp_file_before_prettifying", view)
global_file_rules = get_pref("global_file_rules", view)
respect_editorconfig_files = get_pref("respect_editorconfig_files", view)

editor_file_syntax = view.settings().get("syntax") if get_pref(
"use_editor_syntax") else "?"
"use_editor_syntax", view) else "?"
editor_indent_size = view.settings().get("tab_size") if get_pref(
"use_editor_indentation") else "?"
"use_editor_indentation", view) else "?"
editor_indent_with_tabs = view.settings().get("use_tab_stops") if get_pref(
"use_editor_indentation") else "?"
"use_editor_indentation, view") else "?"

original_file_path = view.file_name() or "?"
previous_viewport_position = view.viewport_position()
Expand Down
8 changes: 6 additions & 2 deletions src/py/utils/window_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
from .file_utils import read_text_from_file, ensure_file


def get_pref(key):
def get_pref(key, view=None):
"""Retrieves the pref value under the given name key from the settings file"""
return load_settings(SETTINGS_FILENAME).get(key)

file_settings = load_settings(SETTINGS_FILENAME)
view_settings = view.settings() if view else {}

return view_settings.get("HTMLPrettify."+key, file_settings.get(key))


def open_config_rc(window):
Expand Down