Thu, 18 Dec 2014 18:56:04 +0100
Fixed an issue related to handling an inactive syntax checker in the editor.
(grafted from efc9c803ebdcbaa76ed6abc8b81d30dd2750b788)
# -*- coding: utf-8 -*- # Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> # # pylint: disable=C0103 """ Module implementing the syntax check for Python 2/3. """ import os import sys def initService(): """ Initialize the service and return the entry point. @return the entry point for the background client (function) """ path = __file__ for i in range(4): path = os.path.dirname(path) sys.path.insert(2, os.path.join(path, "ThirdParty", "Jasy")) return jsCheckSyntax def normalizeCode(codestring): """ Function to normalize the given code. @param codestring code to be normalized (string) @return normalized code (string) """ codestring = codestring.replace("\r\n", "\n").replace("\r", "\n") if codestring and codestring[-1] != '\n': codestring = codestring + '\n' # Check type for py2: if not str it's unicode # if sys.version_info[0] == 2: # try: # codestring = codestring.encode('utf-8') # except UnicodeError: # pass return codestring def jsCheckSyntax(file, codestring): """ Function to check a Javascript source file for syntax errors. @param file source filename (string) @param codestring string containing the code to check (string) @return dictionary with the keys 'error' and 'warnings' which hold a list containing details about the error/ warnings (file name, line number, column, codestring (only at syntax errors), the message, a list with arguments for the message) """ import jasy.js.parse.Parser as jsParser import jasy.js.tokenize.Tokenizer as jsTokenizer codestring = normalizeCode(codestring) try: jsParser.parse(codestring, file) except (jsParser.SyntaxError, jsTokenizer.ParseError) as exc: details = exc.args[0] error, details = details.splitlines() fn, line = details.strip().rsplit(":", 1) error = error.split(":", 1)[1].strip() cline = min(len(codestring.splitlines()), int(line)) - 1 code = codestring.splitlines()[cline] return [{'error': (fn, int(line), 0, code, error)}] return [{}]