From d4f0b44a0d34e3db7cb04cf77a01e5c51b04952f Mon Sep 17 00:00:00 2001 From: TheSecEng Date: Tue, 19 May 2020 15:38:44 -0400 Subject: [PATCH 1/2] fixes: as_json, pretty, validate fixes pretty_on_save fixes validate_on_save implements as_json --- Pretty JSON.sublime-settings | 10 +++++----- PrettyJson.py | 2 +- PrettyJsonListeners.py | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Pretty JSON.sublime-settings b/Pretty JSON.sublime-settings index 823cb9a..613f31a 100644 --- a/Pretty JSON.sublime-settings +++ b/Pretty JSON.sublime-settings @@ -7,7 +7,7 @@ "value_separator": ": ", "keep_arrays_single_line": false, "max_arrays_line_length": 120, - "pretty_on_save": false, + "pretty_on_save": true, "validate_on_save": true, "brace_newline": true, "bracket_newline": true, @@ -19,9 +19,9 @@ "jq_binary": "jq", "jq_errors": false, "as_json":[ - "JSON", - "Sublime Text Commands", - "Sublime Text Settingss", - "Sublime Text Menu" + "Packages/JSON/JSON.sublime-syntax", + "Packages/PackageDev/Package/Sublime Text Commands/Sublime Text Commands.sublime-syntax", + "Packages/PackageDev/Package/Sublime Text Settings/Sublime Text Settings.sublime-syntax", + "Packages/PackageDev/Package/Sublime Text Menu/Sublime Text Menu.sublime-syntax" ] } \ No newline at end of file diff --git a/PrettyJson.py b/PrettyJson.py index 724b3cd..cb1345d 100644 --- a/PrettyJson.py +++ b/PrettyJson.py @@ -131,7 +131,7 @@ class PrettyJsonBaseCommand: return '\n'.join(lines) def show_exception(self, region: sublime.Region = None, msg=str()): - sublime.status_message(f'[Error]: {msg}') + sublime.message_dialog(f'[Error]: {msg}') if region is None: sublime.message_dialog(f'[Error]: {msg}') return diff --git a/PrettyJsonListeners.py b/PrettyJsonListeners.py index f757740..e49851b 100644 --- a/PrettyJsonListeners.py +++ b/PrettyJsonListeners.py @@ -15,6 +15,7 @@ class PrettyJsonLintListener(sublime_plugin.EventListener, PrettyJsonBaseCommand if any( syntax in view.settings().get("syntax") for syntax in as_json ): + self.view = view self.clear_phantoms() json_content = view.substr(sublime.Region(0, view.size())) try: @@ -32,4 +33,4 @@ class PrettyJsonAutoPrettyOnSaveListener(sublime_plugin.EventListener): if any( syntax in view.settings().get('syntax') for syntax in as_json ): - sublime.active_window().run_command('pretty_json') + sublime.active_window().active_view().run_command('pretty_json') From d766dd2aaaf88ff2efd293a8013cc3f46c56d82d Mon Sep 17 00:00:00 2001 From: TheSecEng Date: Tue, 19 May 2020 15:41:40 -0400 Subject: [PATCH 2/2] remove: key binding for jq_query --- Default (Linux).sublime-keymap | 4 ---- Default (OSX).sublime-keymap | 4 ---- Default (Windows).sublime-keymap | 4 ---- 3 files changed, 12 deletions(-) diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap index b479bcd..4ce5b0d 100644 --- a/Default (Linux).sublime-keymap +++ b/Default (Linux).sublime-keymap @@ -5,10 +5,6 @@ ], "command": "pretty_json" }, - { - "keys": ["ctrl+alt+shift+j"], - "command": "jq_query_pretty_json" - }, { "keys": ["ctrl+r"], "command": "pretty_json_goto_symbol", diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap index 3f6cc1c..e7ce965 100644 --- a/Default (OSX).sublime-keymap +++ b/Default (OSX).sublime-keymap @@ -5,10 +5,6 @@ ], "command": "pretty_json" }, - { - "keys": ["super+ctrl+shift+j"], - "command": "jq_query_pretty_json" - }, { "keys": ["super+r"], "command": "pretty_json_goto_symbol", diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap index 2e98782..a1e794b 100644 --- a/Default (Windows).sublime-keymap +++ b/Default (Windows).sublime-keymap @@ -11,10 +11,6 @@ ], "command": "un_pretty_json" }, - { - "keys": ["ctrl+alt+shift+j"], - "command": "jq_query_pretty_json" - }, { "keys": ["ctrl+r"], "command": "pretty_json_goto_symbol",