Ensure correct usage of language IDs (#147)

Signed-off-by: James Humphries <james@james-humphries.co.uk>

Author: Yantrio

internal/langserver/handlers/code_lens.go

@@ -30,7 +30,7 @@ func (svc *service) TextDocumentCodeLens(ctx context.Context, params lsp.CodeLen
 
 	path := lang.Path{
 		Path:       doc.Dir.Path(),
-		LanguageID: doc.LanguageID,
+		LanguageID: string(ilsp.ParseLanguageID(doc.LanguageID)),
 	}
 
 	lenses, err := svc.decoder.CodeLensesForFile(ctx, path, doc.Filename)

internal/langserver/handlers/did_change.go

@@ -59,7 +59,7 @@ func (svc *service) TextDocumentDidChange(ctx context.Context, params lsp.DidCha
 	svc.eventBus.DidChange(eventbus.DidChangeEvent{
 		Context:    ctx, // We pass the context for data here
 		Dir:        dh.Dir,
-		LanguageID: doc.LanguageID,
+		LanguageID: string(ilsp.ParseLanguageID(doc.LanguageID)),
 	})
 
 	return nil

internal/langserver/handlers/go_to_ref_target.go

@@ -14,7 +14,7 @@ import (
 	lsp "github.com/opentofu/tofu-ls/internal/protocol"
 )
 
-func (svc *service) GoToDefinition(ctx context.Context, params lsp.TextDocumentPositionParams) (interface{}, error) {
+func (svc *service) GoToDefinition(ctx context.Context, params lsp.TextDocumentPositionParams) (any, error) {
 	cc, err := ilsp.ClientCapabilities(ctx)
 	if err != nil {
 		return nil, err
@@ -28,7 +28,7 @@ func (svc *service) GoToDefinition(ctx context.Context, params lsp.TextDocumentP
 	return ilsp.RefTargetsToDefinitionLocationLinks(targets, cc.TextDocument.Definition), nil
 }
 
-func (svc *service) GoToDeclaration(ctx context.Context, params lsp.TextDocumentPositionParams) (interface{}, error) {
+func (svc *service) GoToDeclaration(ctx context.Context, params lsp.TextDocumentPositionParams) (any, error) {
 	cc, err := ilsp.ClientCapabilities(ctx)
 	if err != nil {
 		return nil, err
@@ -62,7 +62,7 @@ func (svc *service) goToReferenceTarget(ctx context.Context, params lsp.TextDocu
 
 	path := lang.Path{
 		Path:       doc.Dir.Path(),
-		LanguageID: doc.LanguageID,
+		LanguageID: string(ilsp.ParseLanguageID(doc.LanguageID)),
 	}
 
 	return svc.decoder.ReferenceTargetsForOriginAtPos(path, doc.Filename, pos)

internal/langserver/handlers/references.go

@@ -35,7 +35,7 @@ func (svc *service) References(ctx context.Context, params lsp.ReferenceParams)
 
 	path := lang.Path{
 		Path:       doc.Dir.Path(),
-		LanguageID: doc.LanguageID,
+		LanguageID: ilsp.ParseLanguageID(doc.LanguageID).String(),
 	}
 	// TODO? maybe kick off indexing of the whole workspace here
 	origins := svc.decoder.ReferenceOriginsTargetingPos(path, doc.Filename, pos)

internal/langserver/handlers/service.go

@@ -620,8 +620,10 @@ func (svc *service) shutdown() {
 	}
 }
 
-const requestCancelled jrpc2.Code = -32800
-const tracerName = "github.com/opentofu/tofu-ls/internal/langserver/handlers"
+const (
+	requestCancelled jrpc2.Code = -32800
+	tracerName                  = "github.com/opentofu/tofu-ls/internal/langserver/handlers"
+)
 
 // handle calls a jrpc2.Func compatible function
 func handle(ctx context.Context, req *jrpc2.Request, fn interface{}) (interface{}, error) {
@@ -690,6 +692,6 @@ func handle(ctx context.Context, req *jrpc2.Request, fn interface{}) (interface{
 func (svc *service) decoderForDocument(_ context.Context, doc *document.Document) (*decoder.PathDecoder, error) {
 	return svc.decoder.Path(lang.Path{
 		Path:       doc.Dir.Path(),
-		LanguageID: doc.LanguageID,
+		LanguageID: string(ilsp.ParseLanguageID(doc.LanguageID)),
 	})
 }