Fix Jedi with large character (#201)

gatesn · web-flow · commit 7dde7caefcbe · 2017-12-10T22:42:39.000Z
diff --git a/pyls/workspace.py b/pyls/workspace.py
@@ -264,5 +264,9 @@ def jedi_script(self, position=None):
         }
         if position:
             kwargs['line'] = position['line'] + 1
-            kwargs['column'] = position['character']
+
+            # Normalise the position as per the LSP that accepts character positions > line length
+            # https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md#position
+            line_len = len(self.lines[position['line']])
+            kwargs['column'] = min(position['character'], line_len - 1)
         return jedi.Script(**kwargs)
diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
@@ -40,6 +40,9 @@ def test_jedi_completion():
     assert len(items) > 0
     assert items[0]['label'] == 'isabs(s)'
 
+    # Test we don't throw with big character
+    pyls_jedi_completions(doc, {'line': 1, 'character': 1000})
+
 
 def test_rope_completion():
     # Over 'i' in os.path.isabs(...)
