fix: lsp jump to definition

Author: vknabel

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.0.14-next
+
+- lsp: fix jump to definition
+
 ## v0.0.13
 
 - lsp: semantic syntax highlighting #28

info/globals.go

@@ -1,3 +1,3 @@
 package info
 
-var Version = "0.0.13"
+var Version = "0.0.14-next"

langsrv/handler-definition.go

@@ -32,6 +32,16 @@ func textDocumentDefinition(context *glsp.Context, params *protocol.DefinitionPa
 						Character: uint32(decl.Meta().Source.End.Line),
 					},
 				},
+				TargetSelectionRange: protocol.Range{
+					Start: protocol.Position{
+						Line:      uint32(decl.Meta().Source.Start.Line),
+						Character: uint32(decl.Meta().Source.Start.Column),
+					},
+					End: protocol.Position{
+						Line:      uint32(decl.Meta().Source.End.Line),
+						Character: uint32(decl.Meta().Source.End.Line),
+					},
+				},
 			},
 		}, nil
 	}

langsrv/handler-text-document-did-change.go

@@ -3,6 +3,7 @@ package langsrv
 import (
 	"github.com/tliron/glsp"
 	protocol "github.com/tliron/glsp/protocol_3_16"
+	"github.com/vknabel/lithia/parser"
 )
 
 func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeTextDocumentParams) error {
@@ -17,18 +18,13 @@ func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeText
 		}
 	}
 	entry.item.Text = text
+	syntaxErrs := make([]parser.SyntaxError, 0)
 	fileParser, errs := entry.parser.Parse("default-module", string(params.TextDocument.URI), text)
-	if len(errs) > 0 {
-		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
-		return nil
-	}
+	syntaxErrs = append(syntaxErrs, errs...)
 	sourceFile, errs := fileParser.ParseSourceFile()
-	if len(errs) > 0 {
-		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
-		return nil
-	}
+	syntaxErrs = append(syntaxErrs, errs...)
 	langserver.documentCache.documents[params.TextDocument.URI].fileParser = fileParser
 	langserver.documentCache.documents[params.TextDocument.URI].sourceFile = sourceFile
-	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), nil)
+	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), syntaxErrs)
 	return nil
 }

langsrv/handler-text-document-did-open.go

@@ -8,22 +8,18 @@ import (
 
 func textDocumentDidOpen(context *glsp.Context, params *protocol.DidOpenTextDocumentParams) error {
 	lithiaParser := parser.NewParser()
+
+	syntaxErrs := make([]parser.SyntaxError, 0)
 	fileParser, errs := lithiaParser.Parse("default-module", string(params.TextDocument.URI), params.TextDocument.Text)
-	if len(errs) > 0 {
-		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
-		return nil
-	}
+	syntaxErrs = append(syntaxErrs, errs...)
 	sourceFile, errs := fileParser.ParseSourceFile()
-	if len(errs) > 0 {
-		publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), errs)
-		return nil
-	}
+	syntaxErrs = append(syntaxErrs, errs...)
 	langserver.documentCache.documents[params.TextDocument.URI] = &textDocumentEntry{
 		item:       params.TextDocument,
 		parser:     lithiaParser,
 		fileParser: fileParser,
 		sourceFile: sourceFile,
 	}
-	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), nil)
+	publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), syntaxErrs)
 	return nil
 }

langsrv/handler-text-document-semantic-tokens-full.go

@@ -70,7 +70,7 @@ func textDocumentSemanticTokensFull(context *glsp.Context, params *protocol.Sema
 	(import_members (identifier) @variable.import)
 	(module_declaration name: (identifier) @variable.import)
 	(complex_invocation_expression function: (identifier) @function)
-	(simple_invocation_expression function: (identifier) @function)
+	(simple_invocation_expression function: (identifier) @function.simple)
 	(string_literal) @string
 	(escape_sequence) @string.special
 	(type_expression type: (identifier) @type.enum)
@@ -80,7 +80,7 @@ func textDocumentSemanticTokensFull(context *glsp.Context, params *protocol.Sema
 	(member_identifier) @property
 	
 	(ERROR) @error
-	(identifier) @variable
+	; (identifier) @variable ; would override every other token
 	`), syntax.GetLanguage())
 	if err != nil {
 		return nil, err
@@ -108,7 +108,6 @@ func textDocumentSemanticTokensFull(context *glsp.Context, params *protocol.Sema
 			})
 		}
 	}
-
 	return &protocol.SemanticTokens{
 		Data: serializeHighlightedTokens(tokens),
 	}, nil
@@ -125,7 +124,7 @@ func tokenTypeForCaptureName(captureName string) *tokenType {
 	case "punctuation.bracket":
 		return &token_operator
 	case "variable":
-		return nil
+		return &token_variable
 	case "variable.parameter":
 		return &token_parameter
 	case "variable.builtin":
@@ -140,6 +139,8 @@ func tokenTypeForCaptureName(captureName string) *tokenType {
 		return &token_function
 	case "function.builtin":
 		return &token_function
+	case "function.simple":
+		return &token_decorator
 	case "method":
 		return &token_method
 	case "type":