fix sorting command

This commit is contained in:
TheSecEng 2021-06-28 12:37:22 -07:00
parent 6516ce7070
commit e17e458890
No known key found for this signature in database
GPG Key ID: 4D98046FE19FF417
1 changed files with 3 additions and 4 deletions

View File

@ -55,11 +55,11 @@ class PrettyJsonBaseCommand:
) )
@staticmethod @staticmethod
def json_dumps(obj, minified: bool = False) -> str: def json_dumps(obj, minified: bool = False, force_sorting: bool = False) -> str:
settings = sublime.load_settings("Pretty JSON.sublime-settings") settings = sublime.load_settings("Pretty JSON.sublime-settings")
sort_keys = settings.get("sort_keys", False) sort_keys = settings.get("sort_keys", False)
if PrettyJsonBaseCommand.force_sorting: if force_sorting:
sort_keys = True sort_keys = True
line_separator = settings.get("line_separator", ",") line_separator = settings.get("line_separator", ",")
@ -270,8 +270,7 @@ class PrettyJsonCommand(PrettyJsonBaseCommand, sublime_plugin.TextCommand):
selection_text = self.view.substr(region) selection_text = self.view.substr(region)
try: try:
obj = self.json_loads(selection_text) obj = self.json_loads(selection_text)
json_text = self.json_dumps(obj=obj, minified=False, force_sorting=self.force_sorting)
json_text = self.json_dumps(obj=obj, minified=False)
if not entire_file and settings.get("reindent_block", False): if not entire_file and settings.get("reindent_block", False):
json_text = self.reindent(json_text, region) json_text = self.reindent(json_text, region)