Skip to content

Commit 3189d1d

Browse files
committed
Add lint configuration and fix minor style issues
1 parent 77ba5e8 commit 3189d1d

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

tox.ini

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[tox]
2+
envlist = py3
3+
skipsdist = True
4+
5+
[pycodestyle]
6+
max-line-length = 120
7+
8+
[flake8]
9+
max-line-length = 120

trailing_spaces.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def find_trailing_spaces(view):
9090
include_current_line = bool(ts_settings.get("trailing_spaces_include_current_line",
9191
DEFAULT_IS_ENABLED))
9292
regexp = ts_settings.get("trailing_spaces_regexp") + "$"
93-
no_empty_lines_regexp = "(?<=\S)%s$" % regexp
93+
no_empty_lines_regexp = "(?<=\\S)%s$" % regexp
9494

9595
offending_lines = view.find_all(regexp if include_empty_lines else no_empty_lines_regexp)
9696

@@ -101,7 +101,7 @@ def find_trailing_spaces(view):
101101
return [offending_lines, offending_lines]
102102
else:
103103
current_offender = view.find(regexp if include_empty_lines else no_empty_lines_regexp, line.a)
104-
removal = False if current_offender == None else line.intersects(current_offender)
104+
removal = False if current_offender is None else line.intersects(current_offender)
105105
highlightable = [i for i in offending_lines if i != current_offender] if removal else offending_lines
106106
return [offending_lines, highlightable]
107107

@@ -140,7 +140,7 @@ def match_trailing_spaces(view):
140140
#
141141
# Returns True if the view should be ignored, False otherwise.
142142
def ignore_view(view):
143-
view_syntax = view.settings().get('syntax');
143+
view_syntax = view.settings().get('syntax')
144144

145145
if not view_syntax:
146146
return False
@@ -283,7 +283,7 @@ def get_modified_lines(view):
283283
lines = []
284284
line_numbers = modified_lines_as_numbers(on_disk, on_buffer)
285285
if line_numbers:
286-
lines = [view.full_line(view.text_point(number,0)) for number in line_numbers]
286+
lines = [view.full_line(view.text_point(number, 0)) for number in line_numbers]
287287
return lines
288288

289289

@@ -347,6 +347,7 @@ def only_those_with_trailing_spaces():
347347

348348
return regions
349349

350+
350351
# Private: Deletes the trailing spaces regions.
351352
#
352353
# view - the view, you know
@@ -456,7 +457,7 @@ def run(self, edit):
456457

457458
if deleted:
458459
if ts_settings.get("trailing_spaces_save_after_trim") \
459-
and not ts_settings.get("trailing_spaces_trim_on_save"):
460+
and not ts_settings.get("trailing_spaces_trim_on_save"):
460461
sublime.set_timeout(lambda: self.save(self.view), 10)
461462

462463
msg_parts = {"nbRegions": deleted,

0 commit comments

Comments
 (0)