Fix errors with sublime-color-scheme format in inline diff #1030
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #1029 All sublime JSON files can contain comments and the last item of a dictionary or list is allowed to have a trailing comma. This makes them invalid JSON files, which causes python's json library to raise parse errors. Hence this commit replaces the - json.loads with sublime.decode_value() - json.dumps with sublime.encode_value() and removes the obsolete json import.
While fixing #1029 it was revealed that the generated color scheme was not applied to the inline diff view at all. Hence this commit modifies the `apply_new_theme()` method to ensure only the basename of the generated scheme is set to the view's "color_scheme" setting.
randy3k
approved these changes
Oct 29, 2018
stoivo
approved these changes
Oct 30, 2018
|
Thanks @deathaxe |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes some issues (#1029) with the sublime-color-scheme format. For details refer to the commit messages, please.
I started fixing at the dev branch. If you feel this to be a hotfix, feel free to move it to master.