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.

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

Merge RustLSP vscode types here #1

Merged
merged 6 commits into from
Oct 26, 2016

Conversation

bruno-medeiros
Copy link
Contributor

No description provided.

Added constants with request names (and doc)

TextDocumentItem language_id and version are optional.
Added InitializeParams.initializationOptions.
More internal doc about how types that use extension are mapped in Rust.
Made ClientCapabilities into Value istead of empty object.

Added some changes that were added to LSP in last few monhts:
  Added CompletionItem.additional_text_edits
  Added CompletionItem.command
  
  SignatureInformation.documentation is optional
  SymbolInformation.container_name is optional
  Added DocumentFormattingParams
  Added DocumentRangeFormattingParams
  Added DocumentOnTypeFormattingParams
#[serde(skip_serializing_if="Vec::is_empty")]
#[serde(skip_serializing_if="String::is_empty")]
@@ -975,4 +1317,4 @@ pub struct RenameParams {
/// appropriate message set.
#[serde(rename="newName")]
pub new_name: String,
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a newline to the end of the file? It makes diffs later on cleaner.

@Marwes
Copy link
Member

Marwes commented Oct 25, 2016

Nice!. I'd merge this but what do you think of rust-lang/rls#52 (comment)? I'd prefer to not need the extra Option. Also sent you merge access.

@bruno-medeiros
Copy link
Contributor Author

Hum, I don't seem to be able to merge the PR, says I'm not authorized, even though I just accept your invitation.

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

It says you have write access on the repository page so that is very strange.

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

I can merge this if you want but it would be nice to check that you can actually merge things.

@bruno-medeiros
Copy link
Contributor Author

I can't merge. The page here says to me:
"This pull request can be automatically merged by project collaborators
Only those with write access to this repository can merge pull requests."

I can't push directly from git, I get an error about protected branches? Maybe that's the underlying issue?
https://github.com/blog/2051-protected-branches-and-required-status-checks

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

master is a protected branch (from me as well) since I think its good to at least need a PR for changes.

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

Removed you as collaborator and resent it.

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

Or maybe it is because this PR was created before you got the invite/accepted it?

@bruno-medeiros
Copy link
Contributor Author

Or maybe it is because this PR was created before you got the invite/accepted it?

Re-accepted, but still can't merge. I doubt it's because of the above. It must be because master is protected. If you set it up so that changes have to be approved, I suspect another collaborator must approve the changes, even if I am a collaborator now as well. (I'm don't well how protected branches, but I suspect its so)

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

Now maybe?

@bruno-medeiros bruno-medeiros merged commit 079f0d8 into gluon-lang:master Oct 26, 2016
@bruno-medeiros
Copy link
Contributor Author

bruno-medeiros commented Oct 26, 2016

now it worked 👍

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

🎉 It was a setting in protected branches which I hadn't seen before. Might have been there by default or I ticked it by mistake.

Restrict who can push to this branch Specify people or teams allowed to push to this branch. Required status checks will still prevent these people from merging if the checks fail. 

@bruno-medeiros
Copy link
Contributor Author

I just tried a push directly from Git as well (version number bump)

@Marwes
Copy link
Member

Marwes commented Oct 26, 2016

Ok, I can publish in an hour or so, can give you permission to publish then as well.

snowsignal pushed a commit to snowsignal/lsp-types that referenced this pull request Apr 29, 2024
…isname

Rename `WorkspaceClientCapabilities::diagnostic` to the name matching…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants