Merge pull request pappasam#243 from pappasam/fix-tests-for-syntax-checking

Fix tests for syntax checking

Author: pappasam

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.40.0
+
+### Added
+
+- Diagnostic support using Python's builtin `compile` function.
+
+### Changed
+
+- `pygls` 1.0!
+- Diagnostics (for syntax errors) are once-again enabled by default.
+
 ## 0.39.0
 
 ### Changed

README.md

@@ -42,8 +42,6 @@ jedi-language-server aims to support Jedi's capabilities and expose them through
 
 ### Text Synchronization (for diagnostics)
 
-**Note:** diagnostics are disabled by default because Jedi's syntax checking is not supported for new syntax in Python 3.10+. For a detailed discussion on this topic, please refer to [this issue](https://github.com/pappasam/jedi-language-server/issues/187).
-
 - [textDocument/didChange](https://microsoft.github.io/language-server-protocol/specification#textDocument_didChange)
 - [textDocument/didOpen](https://microsoft.github.io/language-server-protocol/specification#textDocument_didOpen)
 - [textDocument/didSave](https://microsoft.github.io/language-server-protocol/specification#textDocument_didSave)
@@ -207,7 +205,7 @@ See coc-jedi's [configuration instructions](https://github.com/pappasam/coc-jedi
 
 ## Diagnostics
 
-Jedi-powered diagnostics are disabled by default because Jedi's syntax checking is not supported for new syntax in Python 3.10+. For a detailed discussion on this topic, please refer to [this issue](https://github.com/pappasam/jedi-language-server/issues/187).
+Diagnostics are provided by Python's built-in `compile` function.
 
 If you would like diagnostics (from [pylint](https://github.com/PyCQA/pylint), [mypy](https://github.com/python/mypy), etc.), we recommend using the powerful [diagnostic-language-server](https://github.com/iamcco/diagnostic-languageserver).
 

jedi_language_server/initialization_options.py

@@ -38,7 +38,7 @@ class Completion(Model):
 
 
 class Diagnostics(Model):
-    enable: bool = False
+    enable: bool = True
     did_open: bool = True
     did_save: bool = True
     did_change: bool = True

jedi_language_server/jedi_utils.py

@@ -3,7 +3,11 @@
 Translates pygls types back and forth with Jedi
 """
 
+import functools
+import inspect
 import sys
+import threading
+from ast import PyCF_ONLY_AST
 from inspect import Parameter
 from typing import Dict, Iterator, List, Optional, Tuple
 
@@ -33,17 +37,14 @@
 from .initialization_options import HoverDisableOptions, InitializationOptions
 from .type_map import get_lsp_completion_type, get_lsp_symbol_type
 
-import functools
-import threading
-import inspect
-
-from ast import PyCF_ONLY_AST
 
 def debounce(interval_s, keyed_by=None):
+    """Debounce calls to this function until interval_s seconds have passed.
+
+    Decorator copied from https://github.com/python-lsp/python-lsp-
+    server
     """
-        Debounce calls to this function until interval_s seconds have passed.
-        Decorator copied from https://github.com/python-lsp/python-lsp-server
-    """
+
     def wrapper(func):
         timers = {}
         lock = threading.Lock()
@@ -67,7 +68,9 @@ def run():
                 timer = threading.Timer(interval_s, run)
                 timers[key] = timer
                 timer.start()
+
         return debounced
+
     return wrapper
 
 
@@ -275,15 +278,22 @@ def lsp_diagnostic(error: jedi.api.errors.SyntaxError) -> Diagnostic:
     )
 
 
-def lsp_python_diagnostic(uri: str, source: str) -> Diagnostic:
+def lsp_python_diagnostic(uri: str, source: str) -> Optional[Diagnostic]:
     """Get LSP Diagnostic using the compile builtin."""
     try:
         compile(source, uri, "exec", PyCF_ONLY_AST)
         return None
     except SyntaxError as err:
-        column, line = err.offset - 1, err.lineno - 1
-        until_column = getattr(err, "end_offset", 0) - 1
-        until_line = getattr(err, "end_lineno", 0) - 1
+        column = err.offset - 1 if err.offset is not None else 0
+        line = err.lineno - 1 if err.lineno is not None else 0
+
+        _until_column = getattr(err, "end_offset", None)
+        _until_line = getattr(err, "end_lineno", None)
+
+        until_column = (
+            _until_column - 1 if _until_column is not None else column + 1
+        )
+        until_line = _until_line - 1 if _until_line is not None else line + 1
 
         if (line, column) >= (until_line, until_column):
             until_column, until_line = column, line
@@ -294,7 +304,7 @@ def lsp_python_diagnostic(uri: str, source: str) -> Diagnostic:
                 start=Position(line=line, character=column),
                 end=Position(line=until_line, character=until_column),
             ),
-            message=err.__class__.__name__ + ': ' + str(err),
+            message=err.__class__.__name__ + ": " + str(err),
             severity=DiagnosticSeverity.Error,
             source="compile",
         )

jedi_language_server/server.py

@@ -637,14 +637,14 @@ def did_change_configuration(
 # Static capability or initializeOptions functions that rely on a specific
 # client capability or user configuration. These are associated with
 # JediLanguageServer within JediLanguageServerProtocol.lsp_initialize
-@jedi_utils.debounce(1, keyed_by='uri')
+@jedi_utils.debounce(1, keyed_by="uri")
 def _publish_diagnostics(server: JediLanguageServer, uri: str) -> None:
     """Helper function to publish diagnostics for a file."""
     # The debounce decorator delays the execution by 1 second
     # canceling notifications that happen in that interval.
     # Since this function is executed after a delay, we need to check
     # whether the document still exists
-    if not (uri in server.workspace.documents):
+    if uri not in server.workspace.documents:
         return
 
     doc = server.workspace.get_document(uri)
@@ -653,6 +653,7 @@ def _publish_diagnostics(server: JediLanguageServer, uri: str) -> None:
 
     server.publish_diagnostics(uri, diagnostics)
 
+
 # TEXT_DOCUMENT_DID_SAVE
 def did_save_diagnostics(
     server: JediLanguageServer, params: DidSaveTextDocumentParams