Skip to content

fix: resolve short color_scheme paths using find_resources #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gadflysu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve short color_scheme paths using find_resources #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion colorizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,18 @@ class ColorScheme(object):
def __init__(self, settings):
path = settings.get('color_scheme') or DEFAULT_COLOR_SCHEME
if not path.startswith('Packages/'):
path = 'Packages/Color Scheme - Default/' + path
filename = os.path.basename(path)
results = sublime.find_resources(filename)
# Prefer results outside Packages/User/ — subdirs there are
# usually plugin-generated copies (sftp, RainbowBrackets, etc.)
non_user = [r for r in results if not r.startswith('Packages/User/')]
if non_user:
path = non_user[0]
elif results:
path = results[0]
else:
path = 'Packages/Color Scheme - Default/' + filename
log.debug("color_scheme resolved: %r -> %r (all: %r)" % (filename, path, results))
self.path = path[8:]
self.time = datetime.datetime.now()

Expand Down