Merge pull request #184 from deathaxe/fix/event-listener

fix PrettyJsonLintListener
This commit is contained in:
Terminal 2024-08-07 10:19:32 -05:00 committed by GitHub
commit 382534afc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions

View File

@ -6,15 +6,16 @@ from .PrettyJson import PrettyJsonBaseCommand
s = sublime.load_settings("Pretty JSON.sublime-settings") s = sublime.load_settings("Pretty JSON.sublime-settings")
class PrettyJsonLintListener(sublime_plugin.EventListener, PrettyJsonBaseCommand): class PrettyJsonLintListener(sublime_plugin.ViewEventListener, PrettyJsonBaseCommand):
def on_post_save(self, view): def on_post_save(self):
if not s.get("validate_on_save", True): if not s.get("validate_on_save", True):
return return
as_json = s.get("as_json", ["JSON"]) as_json = s.get("as_json", ["JSON"])
if any(syntax in view.settings().get("syntax") for syntax in as_json): view_syntax = self.view.settings().get("syntax")
if any(syntax in view_syntax for syntax in as_json):
self.clear_phantoms() self.clear_phantoms()
json_content = view.substr(sublime.Region(0, view.size())) json_content = self.view.substr(sublime.Region(0, self.view.size()))
try: try:
self.json_loads(json_content) self.json_loads(json_content)
except Exception as ex: except Exception as ex:
@ -27,5 +28,6 @@ class PrettyJsonAutoPrettyOnSaveListener(sublime_plugin.EventListener):
return return
as_json = s.get("as_json", ["JSON"]) as_json = s.get("as_json", ["JSON"])
if any(syntax in view.settings().get("syntax") for syntax in as_json): view_syntax = view.settings().get("syntax")
if any(syntax in view_syntax for syntax in as_json):
view.run_command("pretty_json") view.run_command("pretty_json")