will/HighlightWhitespaces
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for ST3 and disabling plugin by default

Browse Source
This commit is contained in:
Harjeet Singh 2013-10-21 17:20:29 +05:30
parent 148ad95966
commit 7c8152b0d6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
highlight_whitespaces.py
View File

@ -11,7 +11,7 @@ Config summary (see README.md for details):
"highlight_whitespaces_space_highlight_scope_name": "invalid", "highlight_whitespaces_space_highlight_scope_name": "invalid",
"highlight_whitespaces_tab_highlight_scope_name": "invalid", "highlight_whitespaces_tab_highlight_scope_name": "invalid",
"highlight_whitespaces_file_max_size": 1048576, "highlight_whitespaces_file_max_size": 1048576,
"highlight_whitespaces_enabled": true, "highlight_whitespaces_enabled": false,
"highlight_whitespaces_check_spaces": true, "highlight_whitespaces_check_spaces": true,
"highlight_whitespaces_check_tabs": true, "highlight_whitespaces_check_tabs": true,
"highlight_last_whitespace": true "highlight_last_whitespace": true
@ -29,7 +29,7 @@ import sublime_plugin
DEFAULT_MAX_FILE_SIZE = 1048576 DEFAULT_MAX_FILE_SIZE = 1048576
DEFAULT_COLOR_SCOPE_NAME = "invalid" DEFAULT_COLOR_SCOPE_NAME = "invalid"
DEFAULT_IS_ENABLED = True DEFAULT_IS_ENABLED = False
DEFAULT_CHECK_SPACES = True DEFAULT_CHECK_SPACES = True
DEFAULT_CHECK_TABS = True DEFAULT_CHECK_TABS = True
DEFAULT_LAST_WHITESPACE = False DEFAULT_LAST_WHITESPACE = False
@ -39,14 +39,19 @@ hws_settings = sublime.load_settings('highlight_whitespaces.sublime-settings')
hws_enabled = bool(hws_settings.get('highlight_whitespaces_enabled', hws_enabled = bool(hws_settings.get('highlight_whitespaces_enabled',
DEFAULT_IS_ENABLED)) DEFAULT_IS_ENABLED))
def get_settings():
s = sublime.load_settings('highlight_whitespaces.sublime-settings')
return s
# Determine if the view is a find results view # Determine if the view is a find results view
def is_find_results(view): def is_find_results(view):
return view.settings().get('syntax') and "Find Results" in view.settings().get('syntax') return view.settings().get('syntax') and "Find Results" in view.settings().get('syntax')
# Return an array of regions matching whitespaces. # Return an array of regions matching whitespaces.
def find_whitespaces_spaces(view): def find_whitespaces_spaces(view):
hws_settings = get_settings()
last_whitespace = bool(hws_settings.get('highlight_last_whitespace',DEFAULT_LAST_WHITESPACE)) last_whitespace = bool(hws_settings.get('highlight_last_whitespace',DEFAULT_LAST_WHITESPACE))
regex = ' {2,}|\t | \t' regex = ' {1,}|\t | \t'
if last_whitespace: if last_whitespace:
regex += '| {1,}$' regex += '| {1,}$'
@ -58,6 +63,8 @@ def find_whitespaces_tabs(view):
# Highlight whitespaces # Highlight whitespaces
def highlight_whitespaces(view): def highlight_whitespaces(view):
hws_settings = get_settings()
max_size = hws_settings.get('highlight_whitespaces_file_max_size', max_size = hws_settings.get('highlight_whitespaces_file_max_size',
DEFAULT_MAX_FILE_SIZE) DEFAULT_MAX_FILE_SIZE)
space_scope_name = hws_settings.get('highlight_whitespaces_space_highlight_scope_name', space_scope_name = hws_settings.get('highlight_whitespaces_space_highlight_scope_name',