Skip to content

Commit

Permalink
remove section error support
Browse files Browse the repository at this point in the history
  • Loading branch information
idleberg committed Feb 2, 2018
1 parent 4e239a5 commit 7d8d7bc
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions linter.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@ class Makensis(Linter):

"""Provides an interface to the makensis executable."""

cmd = ('makensis', '-V2', '@', '-ppo')
cmd = ('makensis', '-V2', '@', '-X!error "Abort linting"')
version_args = '-VERSION'
version_re = r'(?P<version>\d+\.\d+(\.\d+)?)'
version_requirement = '>= 3.02.1'

syntax = 'nsis'
regex = (
r'((?P<warning>warning): (?P<warnMessage>.*) \(.*:(?P<warnLine>\d+)\)$'
r'|(?P<message>[^\r?\n]+)\r?\n(?P<error>Error) in script "[^"]+" on line (?P<line>\d+) -- aborting creation process$'
r'|(?P<sectionError>Error:) (?P<sectionMessage>.* EOF)$)'
r'((?P<warning>warning): (?P<warnMessage>.*) \(.*:(?P<warnLine>\d+)\)'
r'|(?P<message>[^\r?\n]+)\r?\n(?P<error>Error) in script "[^"]+" on line (?P<line>\d+) -- aborting creation process)'
)
multiline = True
error_stream = util.STREAM_BOTH
Expand All @@ -51,11 +50,4 @@ def split_match(self, match):
message = warnMessage
line = int(warnLine) - 1

return match, line, col, error, warning, message, near

sectionMessage = str(match.groupdict()["sectionMessage"])

if sectionMessage:
message = sectionMessage
line = self.view.rowcol(self.view.size())[0]
return match, line, col, error, warning, message, near
return match, line, col, error, warning, message, near

0 comments on commit 7d8d7bc

Please sign in to comment.