Merge pull request #902 from ChillarAnand/yapf

Catch yapf exceptions
jorgenschaefer · Jun 13, 2016 · c0a9233 · c0a9233
2 parents 45ad707 + 23fa66f
commit c0a9233
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/elpy/tests/test_yapf.py b/elpy/tests/test_yapf.py
@@ -1,20 +1,24 @@
 # coding: utf-8
 """Tests for the elpy.yapf module"""
 
-import sys
 import unittest
 
 from elpy import yapfutil
+from elpy.rpc import Fault
 from elpy.tests.support import BackendTestCase
 
 
 @unittest.skipIf(yapfutil.YAPF_NOT_SUPPORTED,
                  'yapf not supported for current python version')
 class YAPFTestCase(BackendTestCase):
     def setUp(self):
-        if not yapfutil.YAPF_NOT_SUPPORTED:
+        if yapfutil.YAPF_NOT_SUPPORTED:
             raise unittest.SkipTest
 
+    def test_fix_code_should_throw_error_for_invalid_code(self):
+        src = 'x = '
+        self.assertRaises(Fault, yapfutil.fix_code, src)
+
     def test_fix_code(self):
         testdata = [
             ('x=       123\n', 'x = 123\n'),

diff --git a/elpy/yapfutil.py b/elpy/yapfutil.py
@@ -4,10 +4,11 @@
 
 import os
 import sys
+
 from elpy.rpc import Fault
 
 YAPF_NOT_SUPPORTED = sys.version_info < (2, 7) or (
-    sys.version_info >= (3, 0) and sys.version_info <= (3, 3))
+    sys.version_info >= (3, 0) and sys.version_info < (3, 4))
 
 try:
     if YAPF_NOT_SUPPORTED:
@@ -26,8 +27,12 @@ def fix_code(code):
     if not yapf_api:
         raise Fault('yapf not installed', code=400)
     style_config = file_resources.GetDefaultStyleForDir(os.getcwd())
-    reformatted_source, _ = yapf_api.FormatCode(code,
-                                                filename='<stdin>',
-                                                style_config=style_config,
-                                                verify=False)
-    return reformatted_source
+    try:
+        reformatted_source, _ = yapf_api.FormatCode(code,
+                                                    filename='<stdin>',
+                                                    style_config=style_config,
+                                                    verify=False)
+        return reformatted_source
+    except Exception as e:
+            raise Fault("Error during formatting: {}".format(e),
+                        code=400)
diff --git a/test/elpy-yapf-fix-code-test.el b/test/elpy-yapf-fix-code-test.el
@@ -39,3 +39,15 @@
                        "z = 3"
                        "_|_x = 3"
                        ))))))
+
+(ert-deftest elpy-yapf-fix-code-should-throw-error-for-invalid-code ()
+  (let* ((pyversion (getenv "TRAVIS_PYTHON_VERSION"))
+         (yapf-not-supported (or (string< pyversion "2.7")
+                                 (and (not (string< pyversion "3.0"))
+                                      (string< pyversion "3.4")))))
+    (unless yapf-not-supported
+      (elpy-testcase ()
+                     (set-buffer-string-with-point
+                      "x =_|_"
+                      )
+                     (should-error (elpy-yapf-fix-code))))))