Skip to content

Commit 282caeb

Browse files
committed
fix: lsp don't log too many errors
1 parent a63d4e9 commit 282caeb

6 files changed

+17
-16
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- lsp: fix jump to definition
66
- lsp: fix multiline block comments
7+
- lsp: fix logging too many errors
78
- fix: extern docs generation
89
- stdlib: new markup and markdown library
910

langsrv/handler-completion.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
func textDocumentCompletion(context *glsp.Context, params *protocol.CompletionParams) (interface{}, error) {
1010
rc := NewReqContextAtPosition(&params.TextDocumentPositionParams)
1111
sourceFile, err := rc.parseSourceFile()
12-
if err != nil {
13-
return nil, err
12+
if err != nil && sourceFile == nil {
13+
return nil, nil
1414
}
1515
completionItems := []protocol.CompletionItem{}
1616
for _, decl := range sourceFile.Declarations {

langsrv/handler-declaration.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
func textDocumentDeclaration(context *glsp.Context, params *protocol.DeclarationParams) (interface{}, error) {
99
rc := NewReqContextAtPosition(&params.TextDocumentPositionParams)
1010
sourceFile, err := rc.parseSourceFile()
11-
if err != nil {
12-
return nil, err
11+
if err != nil && sourceFile == nil {
12+
return nil, nil
1313
}
1414
token, _, err := rc.findToken()
1515
if err != nil {
16-
return nil, err
16+
return nil, nil
1717
}
1818
for _, decl := range sourceFile.Declarations {
1919
if string(decl.DeclName()) != token || decl.Meta().Source == nil {

langsrv/handler-definition.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
func textDocumentDefinition(context *glsp.Context, params *protocol.DefinitionParams) (interface{}, error) {
99
rc := NewReqContextAtPosition(&params.TextDocumentPositionParams)
1010
sourceFile, err := rc.parseSourceFile()
11-
if err != nil {
12-
return nil, err
11+
if err != nil && sourceFile == nil {
12+
return nil, nil
1313
}
1414
token, _, err := rc.findToken()
15-
if err != nil {
16-
return nil, err
15+
if err != nil && token == "" {
16+
return nil, nil
1717
}
1818
for _, decl := range sourceFile.Declarations {
1919
if string(decl.DeclName()) != token || decl.Meta().Source == nil {

langsrv/handler-hover.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
func textDocumentHover(context *glsp.Context, params *protocol.HoverParams) (*protocol.Hover, error) {
1010
rc := NewReqContextAtPosition(&params.TextDocumentPositionParams)
1111
sourceFile, err := rc.parseSourceFile()
12-
if err != nil {
13-
return nil, err
12+
if err != nil && sourceFile == nil {
13+
return nil, nil
1414
}
1515
name, tokenRange, err := rc.findToken()
16-
if err != nil {
17-
return nil, err
16+
if err != nil && tokenRange == nil {
17+
return nil, nil
1818
}
1919
for _, decl := range sourceFile.Declarations {
2020
if string(decl.DeclName()) != name {

langsrv/handler-type-definition.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
func textDocumentTypeDefinition(context *glsp.Context, params *protocol.TypeDefinitionParams) (interface{}, error) {
99
rc := NewReqContextAtPosition(&params.TextDocumentPositionParams)
10-
_, err := rc.parseSourceFile()
11-
if err != nil {
12-
return nil, err
10+
sourceFile, err := rc.parseSourceFile()
11+
if err != nil && sourceFile == nil {
12+
return nil, nil
1313
}
1414
return nil, nil
1515
}

0 commit comments

Comments
 (0)