Merge remote-tracking branch 'upstream/develop' into develop

Author: danzvara

.circleci/config.yml

@@ -14,7 +14,7 @@ jobs:
 
   python3-test:
     docker:
-      - image: "python:3.5-stretch"
+      - image: "python:3.6-stretch"
     steps:
       - checkout
       # To test Jedi environments
@@ -35,7 +35,7 @@ jobs:
 
   publish:
     docker:
-      - image: "python:3.5-stretch"
+      - image: "python:3.6-stretch"
     steps:
       - checkout
       - run: ./scripts/circle/pypi.sh

appveyor.yml

@@ -6,8 +6,8 @@ environment:
       PYTHON_VERSION: "2.7.15"
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.7"
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6.8"
       PYTHON_ARCH: "64"
 
 matrix:

pyls/config/config.py

@@ -106,29 +106,31 @@ def settings(self, document_path=None):
         settings = {}
         sources = self._settings.get('configurationSources', DEFAULT_CONFIG_SOURCES)
 
+        # Plugin configuration
+        settings = _utils.merge_dicts(settings, self._plugin_settings)
+
+        # LSP configuration
+        settings = _utils.merge_dicts(settings, self._settings)
+
+        # User configuration
         for source_name in reversed(sources):
             source = self._config_sources.get(source_name)
             if not source:
                 continue
             source_conf = source.user_config()
             log.debug("Got user config from %s: %s", source.__class__.__name__, source_conf)
             settings = _utils.merge_dicts(settings, source_conf)
-        log.debug("With user configuration: %s", settings)
-
-        settings = _utils.merge_dicts(settings, self._plugin_settings)
-        log.debug("With plugin configuration: %s", settings)
-
-        settings = _utils.merge_dicts(settings, self._settings)
-        log.debug("With lsp configuration: %s", settings)
 
+        # Project configuration
         for source_name in reversed(sources):
             source = self._config_sources.get(source_name)
             if not source:
                 continue
             source_conf = source.project_config(document_path or self._root_path)
             log.debug("Got project config from %s: %s", source.__class__.__name__, source_conf)
             settings = _utils.merge_dicts(settings, source_conf)
-        log.debug("With project configuration: %s", settings)
+
+        log.debug("With configuration: %s", settings)
 
         return settings
 

pyls/config/pycodestyle_conf.py

@@ -15,6 +15,7 @@
     ('ignore', 'plugins.pycodestyle.ignore', list),
     ('max-line-length', 'plugins.pycodestyle.maxLineLength', int),
     ('select', 'plugins.pycodestyle.select', list),
+    ('aggressive', 'plugins.pycodestyle.aggressive', int),
 ]
 
 

pyls/lsp.py

@@ -24,6 +24,13 @@ class CompletionItemKind(object):
     Color = 16
     File = 17
     Reference = 18
+    Folder = 19
+    EnumMember = 20
+    Constant = 21
+    Struct = 22
+    Event = 23
+    Operator = 24
+    TypeParameter = 25
 
 
 class DocumentHighlightKind(object):

pyls/plugins/autopep8_format.py

@@ -1,6 +1,7 @@
 # Copyright 2018 Palantir Technologies, Inc.
 import logging
-from autopep8 import fix_code
+import pycodestyle
+from autopep8 import fix_code, continued_indentation as autopep8_c_i
 from pyls import hookimpl
 
 log = logging.getLogger(__name__)
@@ -31,8 +32,16 @@ def _format(config, document, line_range=None):
     if line_range:
         options['line_range'] = list(line_range)
 
+    # Temporarily re-monkey-patch the continued_indentation checker - #771
+    del pycodestyle._checks['logical_line'][pycodestyle.continued_indentation]
+    pycodestyle.register_check(autopep8_c_i)
+
     new_source = fix_code(document.source, options=options)
 
+    # Switch it back
+    del pycodestyle._checks['logical_line'][autopep8_c_i]
+    pycodestyle.register_check(pycodestyle.continued_indentation)
+
     if new_source == document.source:
         return []
 
@@ -57,6 +66,7 @@ def _autopep8_config(config):
         'ignore': settings.get('ignore'),
         'max_line_length': settings.get('maxLineLength'),
         'select': settings.get('select'),
+        'aggressive': settings.get('aggressive'),
     }
 
     # Filter out null options

pyls/plugins/flake8_lint.py

@@ -7,6 +7,7 @@
 from pyls import hookimpl, lsp
 
 log = logging.getLogger(__name__)
+FIX_IGNORES_RE = re.compile(r'([^a-zA-Z0-9_,]*;.*(\W+||$))')
 
 
 @hookimpl
@@ -16,7 +17,8 @@ def pyls_settings():
 
 
 @hookimpl
-def pyls_lint(config, document):
+def pyls_lint(workspace, document):
+    config = workspace._config
     settings = config.plugin_settings('flake8')
     log.debug("Got flake8 settings: %s", settings)
 
@@ -39,39 +41,44 @@ def pyls_lint(config, document):
         log.debug("using flake8 with config: %s", opts['config'])
 
     # Call the flake8 utility then parse diagnostics from stdout
-    args = build_args(opts, document.path)
-    output = run_flake8(args)
+    flake8_executable = settings.get('executable', 'flake8')
+
+    args = build_args(opts)
+    output = run_flake8(flake8_executable, args, document)
     return parse_stdout(document, output)
 
 
-def run_flake8(args):
+def run_flake8(flake8_executable, args, document):
     """Run flake8 with the provided arguments, logs errors
     from stderr if any.
     """
-    log.debug("Calling flake8 with args: '%s'", args)
+    # a quick temporary fix to deal with Atom
+    args = [(i if not i.startswith('--ignore=') else FIX_IGNORES_RE.sub('', i))
+            for i in args if i is not None]
+
+    log.debug("Calling %s with args: '%s'", flake8_executable, args)
     try:
-        cmd = ['flake8']
+        cmd = [flake8_executable]
         cmd.extend(args)
-        p = Popen(cmd, stdout=PIPE, stderr=PIPE)
+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
     except IOError:
-        log.debug("Can't execute flake8. Trying with 'python -m flake8'")
+        log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
         cmd = ['python', '-m', 'flake8']
         cmd.extend(args)
-        p = Popen(cmd, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = p.communicate()
+        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    (stdout, stderr) = p.communicate(document.source.encode())
     if stderr:
         log.error("Error while running flake8 '%s'", stderr.decode())
     return stdout.decode()
 
 
-def build_args(options, doc_path):
+def build_args(options):
     """Build arguments for calling flake8.
 
     Args:
         options: dictionary of argument names and their values.
-        doc_path: path of the document to lint.
     """
-    args = [doc_path]
+    args = ['-']  # use stdin
     for arg_name, arg_val in options.items():
         if arg_val is None:
             continue
@@ -118,10 +125,16 @@ def parse_stdout(document, stdout):
     diagnostics = []
     lines = stdout.splitlines()
     for raw_line in lines:
-        parsed_line = re.match(r'(.*):(\d*):(\d*): (\w*) (.*)', raw_line).groups()
-        if not parsed_line or len(parsed_line) != 5:
+        parsed_line = re.match(r'(.*):(\d*):(\d*): (\w*) (.*)', raw_line)
+        if not parsed_line:
+            log.debug("Flake8 output parser can't parse line '%s'", raw_line)
+            continue
+
+        parsed_line = parsed_line.groups()
+        if len(parsed_line) != 5:
             log.debug("Flake8 output parser can't parse line '%s'", raw_line)
             continue
+
         _, line, character, code, msg = parsed_line
         line = int(line) - 1
         character = int(character) - 1

pyls/plugins/jedi_completion.py

@@ -67,8 +67,25 @@ def pyls_completions(config, document, position):
     snippet_support = completion_capabilities.get('completionItem', {}).get('snippetSupport')
 
     should_include_params = settings.get('include_params')
+    should_include_class_objects = settings.get('include_class_objects', True)
+
     include_params = snippet_support and should_include_params and use_snippets(document, position)
-    return [_format_completion(c, include_params) for c in completions] or None
+    include_class_objects = snippet_support and should_include_class_objects and use_snippets(document, position)
+
+    ready_completions = [
+        _format_completion(c, include_params)
+        for c in completions
+    ]
+
+    if include_class_objects:
+        for c in completions:
+            if c.type == 'class':
+                completion_dict = _format_completion(c, False)
+                completion_dict['kind'] = lsp.CompletionItemKind.TypeParameter
+                completion_dict['label'] += ' object'
+                ready_completions.append(completion_dict)
+
+    return ready_completions or None
 
 def is_exception_class(name):
     """
@@ -170,6 +187,7 @@ def _format_completion(d, include_params=True):
             snippet += ')$0'
             completion['insertText'] = snippet
         elif len(positional_args) == 1:
+            completion['insertTextFormat'] = lsp.InsertTextFormat.Snippet
             completion['insertText'] = d.name + '($0)'
         else:
             completion['insertText'] = d.name + '()'
@@ -180,7 +198,7 @@ def _format_completion(d, include_params=True):
 def _label(definition):
     sig = definition.get_signatures()
     if definition.type in ('function', 'method') and sig:
-        params = ', '.join([param.name for param in sig[0].params])
+        params = ', '.join(param.name for param in sig[0].params)
         return '{}({})'.format(definition.name, params)
 
     return definition.name

pyls/plugins/jedi_rename.py

@@ -0,0 +1,47 @@
+# Copyright 2020 Palantir Technologies, Inc.
+import logging
+
+from pyls import hookimpl, uris, _utils
+
+log = logging.getLogger(__name__)
+
+
+@hookimpl
+def pyls_rename(config, workspace, document, position, new_name):  # pylint: disable=unused-argument
+    log.debug('Executing rename of %s to %s', document.word_at_position(position), new_name)
+    kwargs = _utils.position_to_jedi_linecolumn(document, position)
+    kwargs['new_name'] = new_name
+    try:
+        refactoring = document.jedi_script().rename(**kwargs)
+    except NotImplementedError:
+        raise Exception('No support for renaming in Python 2/3.5 with Jedi. '
+                        'Consider using the rope_rename plugin instead')
+    log.debug('Finished rename: %s', refactoring.get_diff())
+    changes = []
+    for file_path, changed_file in refactoring.get_changed_files().items():
+        uri = uris.from_fs_path(file_path)
+        doc = workspace.get_maybe_document(uri)
+        changes.append({
+            'textDocument': {
+                'uri': uri,
+                'version': doc.version if doc else None
+            },
+            'edits': [
+                {
+                    'range': {
+                        'start': {'line': 0, 'character': 0},
+                        'end': {
+                            'line': _num_lines(changed_file.get_new_code()),
+                            'character': 0,
+                        },
+                    },
+                    'newText': changed_file.get_new_code(),
+                }
+            ],
+        })
+    return {'documentChanges': changes}
+
+
+def _num_lines(file_contents):
+    'Count the number of lines in the given string.'
+    return len(file_contents.splitlines())

pyls/plugins/pycodestyle_lint.py

@@ -1,21 +1,26 @@
 # Copyright 2017 Palantir Technologies, Inc.
 import logging
 import pycodestyle
-from autopep8 import continued_indentation as autopep8_c_i
 from pyls import hookimpl, lsp
 
-# Check if autopep8's continued_indentation implementation
-# is overriding pycodestyle's and if so, re-register
-# the check using pycodestyle's implementation as expected
-if autopep8_c_i in pycodestyle._checks['logical_line']:
-    del pycodestyle._checks['logical_line'][autopep8_c_i]
-    pycodestyle.register_check(pycodestyle.continued_indentation)
+try:
+    from autopep8 import continued_indentation as autopep8_c_i
+except ImportError:
+    pass
+else:
+    # Check if autopep8's continued_indentation implementation
+    # is overriding pycodestyle's and if so, re-register
+    # the check using pycodestyle's implementation as expected
+    if autopep8_c_i in pycodestyle._checks['logical_line']:
+        del pycodestyle._checks['logical_line'][autopep8_c_i]
+        pycodestyle.register_check(pycodestyle.continued_indentation)
 
 log = logging.getLogger(__name__)
 
 
 @hookimpl
-def pyls_lint(config, document):
+def pyls_lint(workspace, document):
+    config = workspace._config
     settings = config.plugin_settings('pycodestyle')
     log.debug("Got pycodestyle settings: %s", settings)