Skip to content
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

lsp-devtools: Align to upstream rename #81

Merged
merged 2 commits into from
Sep 14, 2023
Merged

lsp-devtools: Align to upstream rename #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed5f6d8
lsp-devtools: Align to upstream rename
alcarney Sep 11, 2023
9b304db
nix: Update overlay
alcarney Sep 14, 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
4 changes: 2 additions & 2 deletions lib/lsp-devtools/lsp_devtools/agent/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Optional

import stamina
from pygls.client import Client
from pygls.client import JsonRPCClient
from pygls.client import aio_readline
from pygls.protocol import default_converter

Expand All @@ -29,7 +29,7 @@
# asyncio.ensure_future(self._ws.send(data))


class AgentClient(Client):
class AgentClient(JsonRPCClient):
"""Client for connecting to an AgentServer instance."""

protocol: AgentProtocol
Expand Down
1 change: 0 additions & 1 deletion lib/lsp-devtools/lsp_devtools/agent/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import re
import threading
from typing import Any
from typing import Callable
from typing import Optional

from pygls.client import aio_readline
Expand Down
19 changes: 18 additions & 1 deletion lib/pytest-lsp/nix/pytest-lsp-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,30 @@ final: prev: {

});

lsprotocol = python-prev.lsprotocol.overridePythonAttrs(oldAttrs: rec {
version = "2023.0.0a3";

src = prev.fetchFromGitHub {
rev = version;
owner = "microsoft";
repo = oldAttrs.pname;
sha256 = "sha256-Q4jvUIMMaDX8mvdmRtYKHB2XbMEchygO2NMmMQdNkTc=";
};
});

pygls = python-prev.pygls.overridePythonAttrs (_: {
format = "pyproject";

src = prev.fetchFromGitHub {
owner = "openlawlibrary";
repo = "pygls";
rev = "main";
hash = "sha256-KjnuGQy3/YBSZyXYNWz4foUsFRbinujGxCkQjRSK4PE=";
hash = "sha256-JpopfqeLNi23TuZ5mkPEShUPScd1fB0IDXSVGvDYFXE=";
};

nativeBuildInputs = with python-prev; [
poetry-core
];
});

pytest-lsp = python-prev.buildPythonPackage {
Expand Down