close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/lsp: fix watched file protocol constants 

The "Create" and "Delete" WatchKind values were missing from the
generated code because their names were colliding with other
constants. Add "WatchKind" to go.ts prefix map to disambiguate.

Updates golang/go#31553

Change-Id: I60269969831c0822896e87b3f2332ded71748f42
GitHub-Last-Rev: 6d85cf9b3865ba5af0b5ec7f90358e5734ed9451
GitHub-Pull-Request: golang/tools#136
Reviewed-on: https://go-review.googlesource.com/c/tools/+/186097
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
This commit is contained in:
Muir Manders 2019-07-15 16:10:48 +00:00 committed by Rebecca Stambler
parent 09f9cfa882
commit dddb761723
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/lsp/protocol/enums.go
View File

@ -13,7 +13,7 @@ var (
namesInitializeError [int(UnknownProtocolVersion) + 1]string namesInitializeError [int(UnknownProtocolVersion) + 1]string
namesMessageType [int(Log) + 1]string namesMessageType [int(Log) + 1]string
namesFileChangeType [int(Deleted) + 1]string namesFileChangeType [int(Deleted) + 1]string
namesWatchKind [int(Change) + 1]string namesWatchKind [int(WatchDelete) + 1]string
namesCompletionTriggerKind [int(TriggerForIncompleteCompletions) + 1]string namesCompletionTriggerKind [int(TriggerForIncompleteCompletions) + 1]string
namesDiagnosticSeverity [int(SeverityHint) + 1]string namesDiagnosticSeverity [int(SeverityHint) + 1]string
namesDiagnosticTag [int(Unnecessary) + 1]string namesDiagnosticTag [int(Unnecessary) + 1]string
@ -40,7 +40,9 @@ func init() {
namesFileChangeType[int(Changed)] = "Changed" namesFileChangeType[int(Changed)] = "Changed"
namesFileChangeType[int(Deleted)] = "Deleted" namesFileChangeType[int(Deleted)] = "Deleted"
namesWatchKind[int(Change)] = "Change" namesWatchKind[int(WatchCreate)] = "WatchCreate"
namesWatchKind[int(WatchChange)] = "WatchChange"
namesWatchKind[int(WatchDelete)] = "WatchDelete"
namesCompletionTriggerKind[int(Invoked)] = "Invoked" namesCompletionTriggerKind[int(Invoked)] = "Invoked"
namesCompletionTriggerKind[int(TriggerCharacter)] = "TriggerCharacter" namesCompletionTriggerKind[int(TriggerCharacter)] = "TriggerCharacter"

16
internal/lsp/protocol/tsprotocol.go
View File

@ -1,7 +1,7 @@
// Package protocol contains data types and code for LSP jsonrpcs // Package protocol contains data types and code for LSP jsonrpcs
// generated automatically from vscode-languageserver-node // generated automatically from vscode-languageserver-node
// commit: 8801c20b667945f455d7e023c71d2f741caeda25 // commit: 8801c20b667945f455d7e023c71d2f741caeda25
// last fetched Thu Jul 11 2019 13:43:41 GMT-0400 (Eastern Daylight Time) // last fetched Sat Jul 13 2019 18:33:10 GMT-0700 (Pacific Daylight Time)
package protocol package protocol
// Code generated (see typescript/README.md) DO NOT EDIT. // Code generated (see typescript/README.md) DO NOT EDIT.
@ -3611,10 +3611,20 @@ const (
*/ */
Deleted FileChangeType = 3 Deleted FileChangeType = 3
/*Change defined: /*WatchCreate defined:
* Interested in create events.
*/
WatchCreate WatchKind = 1
/*WatchChange defined:
* Interested in change events * Interested in change events
*/ */
Change WatchKind = 2 WatchChange WatchKind = 2
/*WatchDelete defined:
* Interested in delete events
*/
WatchDelete WatchKind = 4
/*Invoked defined: /*Invoked defined:
* Completion was triggered by typing an identifier (24x7 code * Completion was triggered by typing an identifier (24x7 code

8
internal/lsp/protocol/typescript/README.md
View File

@ -4,10 +4,10 @@
1. Make sure `node` is installed. 1. Make sure `node` is installed.
As explained at the [node site](<https://nodejs.org> Node) As explained at the [node site](<https://nodejs.org> Node)
you may need `node install @types/node` for the node runtime types you may need `npm install @types/node` for the node runtime types
2. Install the typescript compiler, with `node install typescript`. 2. Install the typescript compiler, with `npm install typescript`.
3. Make sure `tsc` and `node` are in your execution path. 3. Make sure `tsc` and `node` are in your execution path.
4. Get the typescript code for the jsonrpc protocol with `git clone vscode-lanuageserver-node.git` 4. Get the typescript code for the jsonrpc protocol with `git clone git@github.com:microsoft/vscode-languageserver-node.git`
## Usage ## Usage
@ -31,4 +31,4 @@ To generate the client and server boilerplate (tsclient.go and tsserver.go)
## Note ## Note
`go.ts` uses the Typescript compiler's API, which is [introduced](<https://github.com/Microsoft/TypeScript/wiki/Architectural-Overview> API) in their wiki. `go.ts` uses the Typescript compiler's API, which is [introduced](<https://github.com/Microsoft/TypeScript/wiki/Architectural-Overview> API) in their wiki.

2
internal/lsp/protocol/typescript/go.ts
View File

@ -927,7 +927,7 @@ let byName = new Map<string, Struct>();
// consts are unique. (Go consts are package-level, but Typescript's are // consts are unique. (Go consts are package-level, but Typescript's are
// not.) Use suffixes to minimize changes to gopls. // not.) Use suffixes to minimize changes to gopls.
let pref = new Map<string, string>( let pref = new Map<string, string>(
[['DiagnosticSeverity', 'Severity']]) // typeName->prefix [['DiagnosticSeverity', 'Severity'], ['WatchKind', 'Watch']]) // typeName->prefix
let suff = new Map<string, string>([ let suff = new Map<string, string>([
['CompletionItemKind', 'Completion'], ['InsertTextFormat', 'TextFormat'] ['CompletionItemKind', 'Completion'], ['InsertTextFormat', 'TextFormat']
]) ])