Fixed linting errors

Author: iexavl

ls/ls.go

@@ -68,10 +68,6 @@ type INOLanguageServer struct {
 	sketchRebuilder           *sketchRebuilder
 }
 
-type TranslationOpts struct {
-	loadRelToIde bool
-}
-
 // Config describes the language server configuration.
 type Config struct {
 	Fqbn                            string
@@ -92,6 +88,10 @@ var extToFileType = map[string]string{
 	".hpp": "cpp",
 }
 
+type translationOpts struct {
+	loadRelToIde bool
+}
+
 var yellow = color.New(color.FgHiYellow)
 
 func (ls *INOLanguageServer) writeLock(logger jsonrpc.FunctionLogger, requireClangd bool) {
@@ -612,7 +612,7 @@ func (ls *INOLanguageServer) textDocumentDefinitionReqFromIDE(ctx context.Contex
 
 	var ideLocations []lsp.Location
 	if clangLocations != nil {
-		opts := TranslationOpts{loadRelToIde: true}
+		opts := translationOpts{loadRelToIde: true}
 		ideLocations, err = ls.clang2IdeLocationsArray2(logger, clangLocations, &opts)
 		if err != nil {
 			logger.Logf("Error: %v", err)

ls/ls_clang_to_ide.go

@@ -36,7 +36,7 @@ func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI(logger jsonrpc.Functio
 // - The IDE DocumentURI and Range
 // - a boolean that is true if the clang range is in the preprocessed area of the sketch
 // - an error
-func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI2(logger jsonrpc.FunctionLogger, clangURI lsp.DocumentURI, clangRange lsp.Range, opts *TranslationOpts) (lsp.DocumentURI, lsp.Range, bool, error) {
+func (ls *INOLanguageServer) clang2IdeRangeAndDocumentURI2(logger jsonrpc.FunctionLogger, clangURI lsp.DocumentURI, clangRange lsp.Range, opts *translationOpts) (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)
 	if ls.clangURIRefersToIno(clangURI) {
@@ -320,7 +320,7 @@ func (ls *INOLanguageServer) cland2IdeTextEdits(logger jsonrpc.FunctionLogger, c
 func (ls *INOLanguageServer) clang2IdeLocationsArray(logger jsonrpc.FunctionLogger, clangLocations []lsp.Location) ([]lsp.Location, error) {
 	return ls.clang2IdeLocationsArray2(logger, clangLocations, nil)
 }
-func (ls *INOLanguageServer) clang2IdeLocationsArray2(logger jsonrpc.FunctionLogger, clangLocations []lsp.Location, opts *TranslationOpts) ([]lsp.Location, error) {
+func (ls *INOLanguageServer) clang2IdeLocationsArray2(logger jsonrpc.FunctionLogger, clangLocations []lsp.Location, opts *translationOpts) ([]lsp.Location, error) {
 	ideLocations := []lsp.Location{}
 	for _, clangLocation := range clangLocations {
 		ideLocation, inPreprocessed, err := ls.clang2IdeLocation2(logger, clangLocation, opts)
@@ -340,7 +340,7 @@ func (ls *INOLanguageServer) clang2IdeLocationsArray2(logger jsonrpc.FunctionLog
 func (ls *INOLanguageServer) clang2IdeLocation(logger jsonrpc.FunctionLogger, clangLocation lsp.Location) (lsp.Location, bool, error) {
 	return ls.clang2IdeLocation2(logger, clangLocation, nil)
 }
-func (ls *INOLanguageServer) clang2IdeLocation2(logger jsonrpc.FunctionLogger, clangLocation lsp.Location, opts *TranslationOpts) (lsp.Location, bool, error) {
+func (ls *INOLanguageServer) clang2IdeLocation2(logger jsonrpc.FunctionLogger, clangLocation lsp.Location, opts *translationOpts) (lsp.Location, bool, error) {
 	ideURI, ideRange, inPreprocessed, err := ls.clang2IdeRangeAndDocumentURI2(logger, clangLocation.URI, clangLocation.Range, opts)
 	return lsp.Location{
 		URI:   ideURI,

ls/ls_ide_to_clang.go

@@ -42,18 +42,18 @@ func makeTextDocumentItem(logger jsonrpc.FunctionLogger, path string) (lsp.TextD
 	if filetype == "unknown" {
 		return lsp.TextDocumentItem{URI: uri, LanguageID: filetype}, false, &UnknownFileExtensionError{ext}
 	}
-	languageId := filetype
+	languageID := filetype
 	version := 0
 
 	text, err := os.ReadFile(path)
 	if err != nil {
 		logger.Logf("Could not read file: %v", err)
 		return lsp.TextDocumentItem{}, false, err
 	}
-	return lsp.TextDocumentItem{URI: uri, LanguageID: languageId, Version: version, Text: string(text)}, true, nil
+	return lsp.TextDocumentItem{URI: uri, LanguageID: languageID, Version: version, Text: string(text)}, true, nil
 
 }
-func (ls *INOLanguageServer) idePathToIdeURI2(logger jsonrpc.FunctionLogger, inoPath string, opts *TranslationOpts) (lsp.DocumentURI, error) {
+func (ls *INOLanguageServer) idePathToIdeURI2(logger jsonrpc.FunctionLogger, inoPath string) (lsp.DocumentURI, error) {
 	if inoPath == sourcemapper.NotIno.File {
 		return sourcemapper.NotInoURI, nil
 	}