Skip to content

Update LSP spec to latest #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karthiknadig merged 3 commits into from
Jun 28, 2023
Merged

Update LSP spec to latest #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b239bfa
Add more nox commands
karthiknadig Jun 28, 2023
b71a9d5
Update LSP to latest
karthiknadig Jun 28, 2023
b228899
Fix post rebase
karthiknadig Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 96 additions & 1 deletion generator/lsp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,6 +1706,37 @@
},
"documentation": "A request to format a range in a document."
},
{
"method": "textDocument/rangesFormatting",
"result": {
"kind": "or",
"items": [
{
"kind": "array",
"element": {
"kind": "reference",
"name": "TextEdit"
}
},
{
"kind": "base",
"name": "null"
}
]
},
"messageDirection": "clientToServer",
"params": {
"kind": "reference",
"name": "DocumentRangesFormattingParams"
},
"registrationOptions": {
"kind": "reference",
"name": "DocumentRangeFormattingRegistrationOptions"
},
"documentation": "A request to format ranges in a document.\n\n@since 3.18.0\n@proposed",
"since": "3.18.0",
"proposed": true
},
{
"method": "textDocument/onTypeFormatting",
"result": {
Expand Down Expand Up @@ -5982,6 +6013,47 @@
],
"documentation": "Registration options for a {@link DocumentRangeFormattingRequest}."
},
{
"name": "DocumentRangesFormattingParams",
"properties": [
{
"name": "textDocument",
"type": {
"kind": "reference",
"name": "TextDocumentIdentifier"
},
"documentation": "The document to format."
},
{
"name": "ranges",
"type": {
"kind": "array",
"element": {
"kind": "reference",
"name": "Range"
}
},
"documentation": "The ranges to format"
},
{
"name": "options",
"type": {
"kind": "reference",
"name": "FormattingOptions"
},
"documentation": "The format options"
}
],
"mixins": [
{
"kind": "reference",
"name": "WorkDoneProgressParams"
}
],
"documentation": "The parameters of a {@link DocumentRangesFormattingRequest}.\n\n@since 3.18.0\n@proposed",
"since": "3.18.0",
"proposed": true
},
{
"name": "DocumentOnTypeFormattingParams",
"properties": [
Expand Down Expand Up @@ -9477,7 +9549,19 @@
},
{
"name": "DocumentRangeFormattingOptions",
"properties": [],
"properties": [
{
"name": "rangesSupport",
"type": {
"kind": "base",
"name": "boolean"
},
"optional": true,
"documentation": "Whether the server supports formatting multiple ranges at once.\n\n@since 3.18.0\n@proposed",
"since": "3.18.0",
"proposed": true
}
],
"mixins": [
{
"kind": "reference",
Expand Down Expand Up @@ -12193,6 +12277,17 @@
},
"optional": true,
"documentation": "Whether range formatting supports dynamic registration."
},
{
"name": "rangesSupport",
"type": {
"kind": "base",
"name": "boolean"
},
"optional": true,
"documentation": "Whether the client supports formatting multiple ranges at once.\n\n@since 3.18.0\n@proposed",
"since": "3.18.0",
"proposed": true
}
],
"documentation": "Client capabilities of a {@link DocumentRangeFormattingRequest}."
Expand Down
94 changes: 59 additions & 35 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
import json
import os
import pathlib
import urllib.request as url_lib

Expand All @@ -19,65 +20,60 @@ def _install_requirements(session: nox.Session):

@nox.session()
def tests(session: nox.Session):
"""Run tests for lsprotocol and generator."""
"""Run tests for generator and generated code in all languages."""
_install_requirements(session)

session.log("Running tests: generator and generated Python code.")
session.run("pytest", "./tests")

# TODO: Uncomment after tests are ready
# session.log("Running tests: generated Rust code.")
# with session.chdir("./tests/rust/lsprotocol"):
# session.run("cargo", "test", external=True)

# TODO: Uncomment after tests are ready
# session.log("Running tests: generated C# code.")
# with session.chdir("./test/dotnet/lsprotocol_tests"):
# session.run("dotnet", "test", external=True)


@nox.session()
def lint(session: nox.Session):
"""Lint all packages."""
"""Linting for generator and generated code in all languages."""
_install_requirements(session)

session.log("Linting: generator and generated Python code.")
session.install("isort", "black", "mypy")
session.run("isort", "--profile", "black", "--check", ".")
session.run("black", "--check", ".")
session.run("mypy", "--strict", "--no-incremental", "./packages/python/lsprotocol")

session.log("Linting: generated Rust code.")
with session.chdir("./packages/rust/lsprotocol"):
session.run("cargo", "fmt", "--check", external=True)


@nox.session()
def format(session: nox.Session):
"""Format all code."""
_format_code(session)


def _generate_model(session: nox.Session):
_install_requirements(session)

session.run("python", "-m", "generator")
"""Format generator and lsprotocol package for PyPI."""
_format_code(session)


def _format_code(session: nox.Session):
session.install("isort", "black", "docformatter")
session.install("isort", "black")

session.run("isort", "--profile", "black", ".")
session.run("black", ".")
session.run("docformatter", "--in-place", "--recursive", "--black", ".")
session.run("isort", "--profile", "black", ".")
session.run("black", ".")

# this is for the lsprotocol package only
python_package_path = "./packages/python/lsprotocol"
session.run("isort", "--profile", "black", python_package_path)
session.run("black", python_package_path)
session.run(
"docformatter", "--in-place", "--recursive", "--black", python_package_path
)
# do it again to correct any adjustments done by docformatter
session.run("isort", "--profile", "black", python_package_path)
session.run("black", python_package_path)

with session.chdir("./packages/rust/lsprotocol"):
session.run("cargo", "fmt", external=True)
python_package_path = pathlib.Path("./packages/python/lsprotocol")
session.run("isort", "--profile", "black", os.fspath(python_package_path))
session.run("black", os.fspath(python_package_path))


@nox.session()
def build(session: nox.Session):
"""Build lsprotocol package."""
"""Build lsprotocol (python) package for PyPI."""
session.install("flit")
with session.chdir("./packages/python"):
session.run("flit", "build")
Expand Down Expand Up @@ -117,15 +113,18 @@ def _download_models(session: nox.session):

@nox.session()
def build_lsp(session: nox.Session):
"""Generate lsprotocol package from LSP model."""
_generate_model(session)
"""Generate lsprotocol for all languages."""
generate_python(session)
generate_dotnet(session)
generate_rust(session)


@nox.session()
def update_lsp(session: nox.Session):
"""Update the LSP model and generate the lsprotocol content."""
"""Update the LSP model and generate the lsprotocol for all languages."""
update_packages(session)
_download_models(session)
_generate_model(session)
build_lsp(session)


@nox.session()
Expand All @@ -136,10 +135,17 @@ def update_packages(session: nox.Session):
session.run(
"pip-compile",
"--generate-hashes",
"--resolver=backtracking",
"--upgrade",
"./packages/python/requirements.in",
)
session.run("pip-compile", "--generate-hashes", "--upgrade", "./requirements.in")
session.run(
"pip-compile",
"--generate-hashes",
"--resolver=backtracking",
"--upgrade",
"./requirements.in",
)


@nox.session()
Expand Down Expand Up @@ -218,11 +224,29 @@ def create_plugin(session: nox.Session):


@nox.session()
def update_dotnet(session: nox.Session):
def generate_dotnet(session: nox.Session):
"""Update the dotnet code."""
_download_models(session)
_install_requirements(session)

session.run("python", "-m", "generator", "--plugin", "dotnet")
with session.chdir("./packages/dotnet/lsprotocol"):
session.run("dotnet", "build")
session.run("dotnet", "build", external=True)


@nox.session()
def generate_python(session: nox.Session):
"""Update the python code."""
_install_requirements(session)

session.run("python", "-m", "generator", "--plugin", "python")
_format_code(session)


@nox.session()
def generate_rust(session: nox.Session):
"""Update the rust code."""
_install_requirements(session)

session.run("python", "-m", "generator", "--plugin", "rust")
with session.chdir("./packages/rust/lsprotocol"):
session.run("cargo", "fmt", external=True)
Loading