jedi wip

bt5/erp5_monaco_editor/ExtensionTemplateItem/portal_components/extension.erp5.Jedi.xml

@@ -45,14 +45,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W: 61,  2: Reimport \'ContextSet\' (imported line 52) (reimported)</string>
-                <string>W: 79,  8: Unused variable \'annotation_classes\' (unused-variable)</string>
-                <string>W:156,  8: Unreachable code (unreachable)</string>
-                <string>W:184, 16: Unused variable \'filtered\' (unused-variable)</string>
-                <string>W:132,  2: Unused variable \'get_cached_code_lines\' (unused-variable)</string>
-                <string>W:133,  2: Unused variable \'StringIO\' (unused-variable)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>

product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.PythonCodeUtils.py

+import time
 import json
+import logging
 from Products.ERP5Type.Utils import checkPythonSourceCode
 
+logger = logging.getLogger('extension.erp5.PythonCodeUtils')
+
+
 def checkPythonSourceCodeAsJSON(self, data, REQUEST=None):
   """
   Check Python source suitable for Source Code Editor and return a JSON object
   """
+  import json
 
   # XXX data is encoded as json, because jQuery serialize lists as []
   if isinstance(data, basestring):
@@ -16,6 +22,7 @@ def checkPythonSourceCodeAsJSON(self, data, REQUEST=None):
     return ''.join(("  " + line) for line in text.splitlines(True))
 
   # don't show 'undefined-variable' errors for {Python,Workflow} Script parameters
+  script_name = data.get('script_name') or 'unknown.py'
   is_script = 'bound_names' in data
   if is_script:
     signature_parts = data['bound_names']
@@ -30,7 +37,85 @@ def checkPythonSourceCodeAsJSON(self, data, REQUEST=None):
   else:
     body = data['code']
 
-  message_list = checkPythonSourceCode(body.encode('utf8'), data.get('portal_type'))
+  start = time.time()
+  code = body.encode('utf8')
+
+  import pyflakes.api
+  import pyflakes.reporter
+  import pyflakes.messages
+
+  class Reporter(pyflakes.reporter.Reporter):
+    def __init__(self):  # pylint: disable=super-init-not-called
+      self.message_list = []
+
+    def addMessage(self, row, column, level, text):
+      self.message_list.append(
+          dict(row=row, column=column, type=level, text=text))
+
+    def flake(self, message):
+      # type: (pyflakes.messages.Message,) -> None
+      self.addMessage(
+          row=message.lineno,
+          column=message.col,
+          text=message.message % (message.message_args),
+          level='W')
+
+    def syntaxError(self, filename, msg, lineno, offset, text):
+      self.addMessage(
+          row=lineno,
+          column=offset,
+          text='SyntaxError: {}'.format(text),
+          level='E')
+
+    def unexpectedError(self, filename, msg):
+      # TODO: extend interface to have range and in this case whole range is wrong ?
+      # or use parse with python in that case ?
+      # repro: function(a="b", c)
+      self.addMessage(
+          row=0, column=0, text='Unexpected Error: {}'.format(msg), level='E')
+
+  start = time.time()
+  reporter = Reporter()
+  pyflakes.api.check(code, script_name, reporter)
+  logger.info(
+      'pyflake checked %d lines in %.2f',
+      len(code.splitlines()),
+      time.time() - start
+    )
+
+  message_list = reporter.message_list
+
+  import lib2to3.refactor
+  import lib2to3.pgen2.parse
+  refactoring_tool = lib2to3.refactor.RefactoringTool(fixer_names=('lib2to3.fixes.fix_except', ))
+  old_code = code.decode('utf-8')
+  try:
+    new_code = unicode(refactoring_tool.refactor_string(old_code, script_name))
+  except lib2to3.pgen2.parse.ParseError as e:
+    message, (row, column) = e.context
+    message_list.append(
+          dict(row=row, column=column, type='E', text=message))
+  else:
+    if new_code != old_code:
+      i = 0
+      for new_line, old_line in zip(new_code.splitlines(), old_code.splitlines()):
+        i += 1
+        print ('new_line', new_line, 'old_line', old_line)
+        if new_line != old_line:
+          message_list.append(
+            dict(row=i, column=0, type='W', text=u'-{}\n+{}'.format(old_line, new_line)))
+
+#  import pdb; pdb.set_trace()
+  pylint_message_list = []
+  if 0:
+    start = time.time()
+    pylint_message_list = checkPythonSourceCode(code, data.get('portal_type'))
+    logger.info(
+      'pylint checked %d lines in %.2f',
+      len(code.splitlines()),
+      time.time() - start
+    )
+
   for message_dict in message_list:
     if is_script:
       message_dict['row'] = message_dict['row'] - 2