Skip to content

Fix gopls codeLens commands to include the gopls prefix that it now sends #1131

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
merged 1 commit into from
Nov 4, 2020
Merged

Fix gopls codeLens commands to include the gopls prefix that it now sends #1131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/extensions/gopls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ use serde::Deserialize;
use serde_json::Value;

pub mod command {
pub const TEST: &str = "test";
pub const GENERATE: &str = "generate";
// older versions of gopls send code lens commands without the `gopls` prefix
// so probably a good idea to maintain both for a while.
pub(super) const TEST: &str = "test";
pub(super) const GOPLS_TEST: &str = "gopls.test";
pub(super) const GENERATE: &str = "generate";
pub(super) const GOPLS_GENERATE: &str = "gopls.generate";
}

impl LanguageClient {
pub fn handle_gopls_command(&self, cmd: &Command) -> Result<bool> {
match cmd.command.as_str() {
command::TEST => {
command::TEST | command::GOPLS_TEST => {
if let Some(args) = &cmd.arguments {
if let Some(file) = args.get(0) {
let file = String::deserialize(file)?;
Expand Down Expand Up @@ -40,7 +44,7 @@ impl LanguageClient {
}
}
}
command::GENERATE => {
command::GENERATE | command::GOPLS_GENERATE => {
if let Some(arguments) = &cmd.arguments {
if let Some(package) = arguments.get(0) {
let package = String::deserialize(package)?;
Expand Down