Partial refactoring of CodeAction conversions subroutines

Author: cmaglie

ls/ls.go

@@ -512,10 +512,6 @@ func (ls *INOLanguageServer) TextDocumentHoverReqFromIDE(ctx context.Context, lo
 	return &ideResp, nil
 }
 
-func (ls *INOLanguageServer) clangURIRefersToIno(clangURI lsp.DocumentURI) bool {
-	return clangURI.AsPath().EquivalentTo(ls.buildSketchCpp)
-}
-
 func (ls *INOLanguageServer) TextDocumentSignatureHelpReqFromIDE(ctx context.Context, logger jsonrpc.FunctionLogger, ideParams *lsp.SignatureHelpParams) (*lsp.SignatureHelp, *jsonrpc.ResponseError) {
 	ls.readLock(logger, true)
 	defer ls.readUnlock(logger)
@@ -782,24 +778,23 @@ func (ls *INOLanguageServer) TextDocumentCodeActionReqFromIDE(ctx context.Contex
 	ideURI := ideTextDocument.URI
 	logger.Logf("--> codeAction(%s:%s)", ideTextDocument, ideParams.Range.Start)
 
-	cppTextDocument, err := ls.ide2ClangTextDocumentIdentifier(logger, ideTextDocument)
+	clangURI, clangRange, err := ls.ide2ClangRange(logger, ideURI, ideParams.Range)
 	if err != nil {
 		logger.Logf("Error: %s", err)
 		return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
 	}
 
+	clangContext, err := ls.ide2ClangCodeActionContext(logger, ideURI, ideParams.Context)
+	if err != nil {
+		logger.Logf("Error: %s", err)
+		return nil, &jsonrpc.ResponseError{Code: jsonrpc.ErrorCodesInternalError, Message: err.Error()}
+	}
 	clangParams := &lsp.CodeActionParams{
-		TextDocument:           cppTextDocument,
 		WorkDoneProgressParams: ideParams.WorkDoneProgressParams,
 		PartialResultParams:    ideParams.PartialResultParams,
-		Range:                  ideParams.Range,
-		Context:                ideParams.Context,
-	}
-	if cppTextDocument.URI.AsPath().EquivalentTo(ls.buildSketchCpp) {
-		clangParams.Range = ls.sketchMapper.InoToCppLSPRange(ideURI, ideParams.Range)
-		for i, inoDiag := range ideParams.Context.Diagnostics {
-			clangParams.Context.Diagnostics[i].Range = ls.sketchMapper.InoToCppLSPRange(ideURI, inoDiag.Range)
-		}
+		TextDocument:           lsp.TextDocumentIdentifier{URI: clangURI},
+		Range:                  clangRange,
+		Context:                clangContext,
 	}
 	logger.Logf("    --> codeAction(%s:%s)", clangParams.TextDocument, ideParams.Range.Start)
 

ls/ls_clang_to_ide.go

@@ -8,6 +8,10 @@ import (
 	"go.bug.st/lsp/jsonrpc"
 )
 
+func (ls *INOLanguageServer) clangURIRefersToIno(clangURI lsp.DocumentURI) bool {
+	return clangURI.AsPath().EquivalentTo(ls.buildSketchCpp)
+}
+
 func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.FunctionLogger, clangURI lsp.DocumentURI, clangRange lsp.Range) (lsp.DocumentURI, lsp.Range, bool, error) {
 	// Sketchbook/Sketch/Sketch.ino      <-> build-path/sketch/Sketch.ino.cpp
 	// Sketchbook/Sketch/AnotherTab.ino  <-> build-path/sketch/Sketch.ino.cpp  (different section from above)

ls/ls_ide_to_clang.go

@@ -117,3 +117,63 @@ func (ls *INOLanguageServer) ide2ClangVersionedTextDocumentIdentifier(logger jso
 		Version:                ideVersionedDoc.Version,
 	}, err
 }
+
+func (ls *INOLanguageServer) ide2ClangDiagnosticRelatedInformationArray(logger jsonrpc.FunctionLogger, ideInfos []lsp.DiagnosticRelatedInformation) ([]lsp.DiagnosticRelatedInformation, error) {
+	clangInfos := []lsp.DiagnosticRelatedInformation{}
+	for _, ideInfo := range ideInfos {
+		clangLocation, err := ls.ide2ClangLocation(logger, ideInfo.Location)
+		if err != nil {
+			return nil, err
+		}
+		clangInfos = append(clangInfos, lsp.DiagnosticRelatedInformation{
+			Message:  ideInfo.Message,
+			Location: clangLocation,
+		})
+	}
+	return clangInfos, nil
+}
+
+func (ls *INOLanguageServer) ide2ClangLocation(logger jsonrpc.FunctionLogger, ideLocation lsp.Location) (lsp.Location, error) {
+	clangURI, clangRange, err := ls.ide2ClangRange(logger, ideLocation.URI, ideLocation.Range)
+	return lsp.Location{
+		URI:   clangURI,
+		Range: clangRange,
+	}, err
+}
+
+func (ls *INOLanguageServer) ide2ClangDiagnostic(logger jsonrpc.FunctionLogger, ideURI lsp.DocumentURI, ideDiag lsp.Diagnostic) (lsp.DocumentURI, lsp.Diagnostic, error) {
+	clangURI, clangRange, err := ls.ide2ClangRange(logger, ideURI, ideDiag.Range)
+	if err != nil {
+		return lsp.DocumentURI{}, lsp.Diagnostic{}, err
+	}
+	clangDiagRelatedInfo, err := ls.ide2ClangDiagnosticRelatedInformationArray(logger, ideDiag.RelatedInformation)
+	if err != nil {
+		return lsp.DocumentURI{}, lsp.Diagnostic{}, err
+	}
+	return clangURI, lsp.Diagnostic{
+		Range:              clangRange,
+		RelatedInformation: clangDiagRelatedInfo,
+		Severity:           ideDiag.Severity,
+		Code:               ideDiag.Code,
+		CodeDescription:    ideDiag.CodeDescription,
+		Source:             ideDiag.Source,
+		Message:            ideDiag.Message,
+		Tags:               ideDiag.Tags,
+		Data:               ideDiag.Data,
+	}, nil
+}
+
+func (ls *INOLanguageServer) ide2ClangCodeActionContext(logger jsonrpc.FunctionLogger, ideURI lsp.DocumentURI, ideContext lsp.CodeActionContext) (lsp.CodeActionContext, error) {
+	clangDiagnostics := []lsp.Diagnostic{}
+	for _, ideDiag := range ideContext.Diagnostics {
+		_, clangDiag, err := ls.ide2ClangDiagnostic(logger, ideURI, ideDiag)
+		if err != nil {
+			return lsp.CodeActionContext{}, err
+		}
+		clangDiagnostics = append(clangDiagnostics, clangDiag)
+	}
+	return lsp.CodeActionContext{
+		Diagnostics: clangDiagnostics,
+		Only:        ideContext.Only,
+	}, nil
+}