Skip to content

Commit 84d1515

Browse files
committed
refactor: use "@github/copilot-language-server" instead
Signed-off-by: Jack Cherng <[email protected]>
1 parent d15ccde commit 84d1515

File tree

4 files changed

+72
-16
lines changed

4 files changed

+72
-16
lines changed

LSP-copilot.sublime-settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
],
4747
// The (Jinja2) template of the status bar text which is inside the parentheses `(...)`.
4848
// See https://jinja.palletsprojects.com/templates/
49-
"status_text": "{% if is_copilot_ignored %}{{ is_copilot_ignored }}{% elif is_waiting %}{{ is_waiting }}{% elif server_version %}v{{ server_version }}{% endif %}",
49+
"status_text": "{% if is_copilot_ignored %}{{ is_copilot_ignored }}{% elif is_waiting %}{{ is_waiting }}{% elif server_version %}v{{ server_version }}{% if server_model %}; {{ server_model }}{% endif %}{% endif %}",
5050
"telemetry": {
5151
"telemetryLevel": null
5252
},

language-server/package-lock.json

Lines changed: 57 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

language-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
33
"dependencies": {
4-
"copilot-node-server": "^1.41.0"
4+
"@github/copilot-language-server": "^1.264.0"
55
}
66
}

plugin/client.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ class CopilotPlugin(NpmClientHandler):
102102
server_binary_path = os.path.join(
103103
server_directory,
104104
"node_modules",
105-
"copilot-node-server",
106-
"copilot",
105+
"@github",
106+
"copilot-language-server",
107107
"dist",
108108
"language-server.js",
109109
)
110110

111+
server_model = ""
112+
"""The current used model of the Github Copilot language server."""
111113
server_version = ""
112-
"""The version of the [copilot.vim](https://github.com/github/copilot.vim) package."""
114+
"""The version of the "@github/copilot-language-server" package."""
113115
server_version_gh = ""
114116
"""The version of the Github Copilot language server."""
115117

@@ -286,7 +288,13 @@ def from_view(cls, view: sublime.View) -> CopilotPlugin | None:
286288
@classmethod
287289
def parse_server_version(cls) -> str:
288290
lock_file_content = sublime.load_resource(f"Packages/{PACKAGE_NAME}/language-server/package-lock.json")
289-
return jmespath.search('dependencies."copilot-node-server".version', json.loads(lock_file_content)) or ""
291+
return (
292+
jmespath.search(
293+
'dependencies."@github/copilot-language-server".version',
294+
json.loads(lock_file_content),
295+
)
296+
or ""
297+
)
290298

291299
@classmethod
292300
def plugin_session(cls, view: sublime.View) -> tuple[None, None] | tuple[CopilotPlugin, Session | None]:
@@ -308,6 +316,7 @@ def update_status_bar_text(self, extra_variables: dict[str, Any] | None = None)
308316
return
309317

310318
variables: dict[str, Any] = {
319+
"server_model": self.server_model,
311320
"server_version": self.server_version,
312321
"server_version_gh": self.server_version_gh,
313322
}

0 commit comments

Comments
 (0)